diff options
author | Benjamin Peterson <benjamin@python.org> | 2012-02-20 21:44:56 -0500 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2012-02-20 21:44:56 -0500 |
commit | aee9dfba4a9230f2832dd69d67e92f8e0490a163 (patch) | |
tree | 27a9896969ac7ff79dc75017cff121a077c3eb6e /Lib/test/test_sys.py | |
parent | 34b345b8885e5db8ab6627c081ca86a8b78b6989 (diff) | |
parent | b19fb2462eac776746f6cb40cc84b0587c83b9bc (diff) | |
download | cpython-git-aee9dfba4a9230f2832dd69d67e92f8e0490a163.tar.gz |
merge 2.6 with hash randomization fix
Diffstat (limited to 'Lib/test/test_sys.py')
-rw-r--r-- | Lib/test/test_sys.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 6e37ac4487..12d4d31194 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -438,7 +438,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", "bytes_warning") + "unicode", "bytes_warning", "hash_randomization") for attr in attrs: self.assertTrue(hasattr(sys.flags, attr), attr) self.assertEqual(type(getattr(sys.flags, attr)), int, attr) |