summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-06-06 09:02:07 (GMT)
committerGeorg Brandl <georg@python.org>2008-06-06 09:02:07 (GMT)
commitc5e88d5f471056c14ae9d6677cef5473282936ad (patch)
tree6e9167f13dcd905f38fb4b745502441169c1fd10
parent9a5df4d3b7f849abbb068caf22d57e2c72f05d15 (diff)
downloadcpython-c5e88d5f471056c14ae9d6677cef5473282936ad.zip
cpython-c5e88d5f471056c14ae9d6677cef5473282936ad.tar.gz
cpython-c5e88d5f471056c14ae9d6677cef5473282936ad.tar.bz2
Fix sys.flags sequence behavior and add a test case.
-rw-r--r--Lib/test/test_sys.py3
-rw-r--r--Python/sysmodule.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 493ef8d..d091413 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -324,12 +324,13 @@ class SysModuleTest(unittest.TestCase):
self.failUnless(sys.flags)
attrs = ("debug", "division_warning",
"inspect", "interactive", "optimize", "dont_write_bytecode",
- "no_site", "ignore_environment", "verbose",
+ "no_user_site", "no_site", "ignore_environment", "verbose",
"bytes_warning")
for attr in attrs:
self.assert_(hasattr(sys.flags, attr), attr)
self.assertEqual(type(getattr(sys.flags, attr)), int, attr)
self.assert_(repr(sys.flags))
+ self.assertEqual(len(sys.flags), len(attrs))
def test_clear_type_cache(self):
sys._clear_type_cache()
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index de2e91d..aebae62 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1150,9 +1150,9 @@ static PyStructSequence_Desc flags_desc = {
flags__doc__, /* doc */
flags_fields, /* fields */
#ifdef RISCOS
- 11
+ 12
#else
- 10
+ 11
#endif
};