comparison Python/sysmodule.c @ 75097:ed76dc34b39d

Merge 3.2: Issue #13703 plus some related test suite fixes.
author Georg Brandl <georg@python.org>
date Tue, 21 Feb 2012 00:33:36 +0100
parents 8b591a86fc91 4a31f6b11e7a
children 294f8aeb4d4b
comparison
equal deleted inserted replaced
75082:3297dcdad196 75097:ed76dc34b39d
1330 #endif 1330 #endif
1331 /* {"unbuffered", "-u"}, */ 1331 /* {"unbuffered", "-u"}, */
1332 /* {"skip_first", "-x"}, */ 1332 /* {"skip_first", "-x"}, */
1333 {"bytes_warning", "-b"}, 1333 {"bytes_warning", "-b"},
1334 {"quiet", "-q"}, 1334 {"quiet", "-q"},
1335 {"hash_randomization", "-R"},
1335 {0} 1336 {0}
1336 }; 1337 };
1337 1338
1338 static PyStructSequence_Desc flags_desc = { 1339 static PyStructSequence_Desc flags_desc = {
1339 "sys.flags", /* name */ 1340 "sys.flags", /* name */
1340 flags__doc__, /* doc */ 1341 flags__doc__, /* doc */
1341 flags_fields, /* fields */ 1342 flags_fields, /* fields */
1342 #ifdef RISCOS 1343 #ifdef RISCOS
1344 13
1345 #else
1343 12 1346 12
1344 #else
1345 11
1346 #endif 1347 #endif
1347 }; 1348 };
1348 1349
1349 static PyObject* 1350 static PyObject*
1350 make_flags(void) 1351 make_flags(void)
1373 #endif 1374 #endif
1374 /* SetFlag(saw_unbuffered_flag); */ 1375 /* SetFlag(saw_unbuffered_flag); */
1375 /* SetFlag(skipfirstline); */ 1376 /* SetFlag(skipfirstline); */
1376 SetFlag(Py_BytesWarningFlag); 1377 SetFlag(Py_BytesWarningFlag);
1377 SetFlag(Py_QuietFlag); 1378 SetFlag(Py_QuietFlag);
1379 SetFlag(Py_HashRandomizationFlag);
1378 #undef SetFlag 1380 #undef SetFlag
1379 1381
1380 if (PyErr_Occurred()) { 1382 if (PyErr_Occurred()) {
1381 return NULL; 1383 return NULL;
1382 } 1384 }