(original) (raw)

changeset: 75669:b30171bbc571 parent: 75666:587bca79599f user: Benjamin Peterson benjamin@python.org date: Wed Mar 14 17:41:15 2012 -0500 files: Lib/lib2to3/pytree.py Lib/lib2to3/tests/test_pytree.py Misc/NEWS description: remove get_prefix and set_prefix (#13248) diff -r 587bca79599f -r b30171bbc571 Lib/lib2to3/pytree.py --- a/Lib/lib2to3/pytree.py Wed Mar 14 23:27:12 2012 +0100 +++ b/Lib/lib2to3/pytree.py Wed Mar 14 17:41:15 2012 -0500 @@ -109,26 +109,6 @@ """ raise NotImplementedError - def set_prefix(self, prefix): - """ - Set the prefix for the node (see Leaf class). - - DEPRECATED; use the prefix property directly. - """ - warnings.warn("set_prefix() is deprecated; use the prefix property", - DeprecationWarning, stacklevel=2) - self.prefix = prefix - - def get_prefix(self): - """ - Return the prefix for the node (see Leaf class). - - DEPRECATED; use the prefix property directly. - """ - warnings.warn("get_prefix() is deprecated; use the prefix property", - DeprecationWarning, stacklevel=2) - return self.prefix - def replace(self, new): """Replace this node with a new one in the parent.""" assert self.parent is not None, str(self) diff -r 587bca79599f -r b30171bbc571 Lib/lib2to3/tests/test_pytree.py --- a/Lib/lib2to3/tests/test_pytree.py Wed Mar 14 23:27:12 2012 +0100 +++ b/Lib/lib2to3/tests/test_pytree.py Wed Mar 14 17:41:15 2012 -0500 @@ -31,23 +31,6 @@ """Unit tests for nodes (Base, Leaf, Node).""" - if sys.version_info >= (2,6): - # warnings.catch_warnings is new in 2.6. - def test_deprecated_prefix_methods(self): - l = pytree.Leaf(100, "foo") - with warnings.catch_warnings(record=True) as w: - warnings.simplefilter("always", DeprecationWarning) - self.assertEqual(l.get_prefix(), "") - l.set_prefix("hi") - self.assertEqual(l.prefix, "hi") - self.assertEqual(len(w), 2) - for warning in w: - self.assertTrue(warning.category is DeprecationWarning) - self.assertEqual(str(w[0].message), "get_prefix() is deprecated; " \ - "use the prefix property") - self.assertEqual(str(w[1].message), "set_prefix() is deprecated; " \ - "use the prefix property") - def test_instantiate_base(self): if __debug__: # Test that instantiating Base() raises an AssertionError diff -r 587bca79599f -r b30171bbc571 Misc/NEWS --- a/Misc/NEWS Wed Mar 14 23:27:12 2012 +0100 +++ b/Misc/NEWS Wed Mar 14 17:41:15 2012 -0500 @@ -24,6 +24,8 @@ Library ------- +- Issue #13248: Remove lib2to3.pytree.Base.get_prefix/set_prefix. + - Issue #14234: CVE-2012-0876: Randomize hashes of xml attributes in the hash table internal to the pyexpat module's copy of the expat library to avoid a denial of service due to hash collisions. Patch by David Malcolm with some /benjamin@python.org