diff options
author | Martin v. Löwis <martin@v.loewis.de> | 2007-06-10 09:51:05 (GMT) |
---|---|---|
committer | Martin v. Löwis <martin@v.loewis.de> | 2007-06-10 09:51:05 (GMT) |
commit | 5b222135f8d2492713994f2cb003980e87ce6a72 (patch) | |
tree | 3ac3a6a1d7805360ed779e884ca6c4b3f000321f /Lib | |
parent | 38e43c25eede3fa77d90ac8183cc0335f4861f4a (diff) | |
download | cpython-5b222135f8d2492713994f2cb003980e87ce6a72.zip cpython-5b222135f8d2492713994f2cb003980e87ce6a72.tar.gz cpython-5b222135f8d2492713994f2cb003980e87ce6a72.tar.bz2 |
Make identifiers str (not str8) objects throughout.
This affects the parser, various object implementations,
and all places that put identifiers into C string literals.
In testing, a number of crashes occurred as code would
fail when the recursion limit was reached (such as the
Unicode interning dictionary having key/value pairs where
key is not value). To solve these, I added an overflowed
flag, which allows for 50 more recursions after the
limit was reached and the exception was raised, and
a recursion_critical flag, which indicates that recursion
absolutely must be allowed, i.e. that a certain call
must not cause a stack overflow exception.
There are still some places where both str and str8 are
accepted as identifiers; these should eventually be
removed.
Diffstat (limited to 'Lib')
-rw-r--r-- | Lib/test/test_frozen.py | 2 | ||||
-rw-r--r-- | Lib/test/test_new.py | 2 | ||||
-rw-r--r-- | Lib/test/test_sys.py | 12 |
3 files changed, 9 insertions, 7 deletions
diff --git a/Lib/test/test_frozen.py b/Lib/test/test_frozen.py index 678b9a8..f1299f0 100644 --- a/Lib/test/test_frozen.py +++ b/Lib/test/test_frozen.py @@ -10,6 +10,8 @@ from test.test_support import TestFailed import sys, os +raise TestFailed, "test currently causes assertion in debug mode" + try: import __hello__ except ImportError as x: diff --git a/Lib/test/test_new.py b/Lib/test/test_new.py index c919621..797a8c3 100644 --- a/Lib/test/test_new.py +++ b/Lib/test/test_new.py @@ -143,7 +143,7 @@ class NewTest(unittest.TestCase): firstlineno, lnotab) # new.code used to be a way to mutate a tuple... - class S(str8): + class S(str): pass t = (S("ab"),) d = new.code(argcount, kwonlyargcount, nlocals, stacksize, diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index b038ff4..e72b7f8 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -321,12 +321,6 @@ class SysModuleTest(unittest.TestCase): self.assertRaises(TypeError, sys.intern, S("abc")) - # It's still safe to pass these strings to routines that - # call intern internally, e.g. PyObject_SetAttr(). - s = S("abc") - setattr(s, s, s) - self.assertEqual(getattr(s, s), s) - s = "never interned as unicode before" self.assert_(sys.intern(s) is s) s2 = s.swapcase().swapcase() @@ -338,6 +332,12 @@ class SysModuleTest(unittest.TestCase): self.assertRaises(TypeError, sys.intern, U("abc")) + # It's still safe to pass these strings to routines that + # call intern internally, e.g. PyObject_SetAttr(). + s = U("abc") + setattr(s, s, s) + self.assertEqual(getattr(s, s), s) + def test_main(): test.test_support.run_unittest(SysModuleTest) |