remove get_prefix and set_prefix (#13248)
This commit is contained in:
parent
7c466b4fdc
commit
1a5e5de818
|
@ -109,26 +109,6 @@ class Base(object):
|
|||
"""
|
||||
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)
|
||||
|
|
|
@ -31,23 +31,6 @@ class TestNodes(support.TestCase):
|
|||
|
||||
"""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
|
||||
|
|
|
@ -24,6 +24,8 @@ Core and Builtins
|
|||
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
|
||||
|
|
Loading…
Reference in New Issue