Fix sys.flags to properly expose bytes_warning.

Closes issue #2790.

diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 8befe7587e24e1755c6961f123d5fa4aba149fce..975795a8ef7d109bfa38c2c0bc77564d2c48df5d 100644 (file)
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -357,7 +357,7 @@ class SysModuleTest(unittest.TestCase):
         attrs = ("debug", "py3k_warning", "division_warning", "division_new",
                  "inspect", "interactive", "optimize", "dont_write_bytecode",
                  "no_site", "ignore_environment", "tabcheck", "verbose",
-                 "unicode")
+                 "unicode", "bytes_warning")
         for attr in attrs:
             self.assert_(hasattr(sys.flags, attr), attr)
             self.assertEqual(type(getattr(sys.flags, attr)), int, attr)

diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 8a1ef3c5d7b9613483edf888686f0e2ba188de1d..c8842503beae44f0b888316b5d8c67b70af755b8 100644 (file)
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -1178,9 +1178,9 @@ static PyStructSequence_Desc flags_desc = {
        flags__doc__,   /* doc */
        flags_fields,   /* fields */
 #ifdef RISCOS
-       15
+       16
 #else
-       14
+       15
 #endif
 };