summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-02-26 19:07:18 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-02-26 19:07:18 (GMT)
commitb3dd5485da12739d71890828a2e2d457b9f633c0 (patch)
treee2e4bcc725b300443b7131056ddcacf0143f2bbf
parent7bee77c8763cbcb02264bfc147c6c932134b924a (diff)
downloadcpython-b3dd5485da12739d71890828a2e2d457b9f633c0.zip
cpython-b3dd5485da12739d71890828a2e2d457b9f633c0.tar.gz
cpython-b3dd5485da12739d71890828a2e2d457b9f633c0.tar.bz2
remove deprecated symtable.Symbol methods
-rw-r--r--Lib/symtable.py15
-rw-r--r--Lib/test/test_symtable.py16
-rw-r--r--Misc/NEWS4
3 files changed, 4 insertions, 31 deletions
diff --git a/Lib/symtable.py b/Lib/symtable.py
index 9d58618..a8112ff 100644
--- a/Lib/symtable.py
+++ b/Lib/symtable.py
@@ -5,7 +5,6 @@ from _symtable import (USE, DEF_GLOBAL, DEF_LOCAL, DEF_PARAM,
DEF_IMPORT, DEF_BOUND, OPT_IMPORT_STAR, OPT_EXEC, OPT_BARE_EXEC,
SCOPE_OFF, SCOPE_MASK, FREE, GLOBAL_IMPLICIT, GLOBAL_EXPLICIT)
-import warnings
import weakref
__all__ = ["symtable", "SymbolTable", "Class", "Function", "Symbol"]
@@ -191,16 +190,6 @@ class Symbol(object):
def is_global(self):
return bool(self.__scope in (GLOBAL_IMPLICIT, GLOBAL_EXPLICIT))
- def is_vararg(self):
- warnings.warn("is_vararg() is obsolete and will be removed",
- DeprecationWarning, 2)
- return False
-
- def is_keywordarg(self):
- warnings.warn("is_keywordarg() is obsolete and will be removed",
- DeprecationWarning, 2)
- return False
-
def is_local(self):
return bool(self.__flags & DEF_BOUND)
@@ -213,10 +202,6 @@ class Symbol(object):
def is_assigned(self):
return bool(self.__flags & DEF_LOCAL)
- def is_in_tuple(self):
- warnings.warn("is_in_tuple() is obsolete and will be removed",
- DeprecationWarning, 2)
-
def is_namespace(self):
"""Returns true if name binding introduces new namespace.
diff --git a/Lib/test/test_symtable.py b/Lib/test/test_symtable.py
index f1fa18a..cdb216b 100644
--- a/Lib/test/test_symtable.py
+++ b/Lib/test/test_symtable.py
@@ -55,22 +55,6 @@ class SymtableTest(unittest.TestCase):
internal = find_block(spam, "internal")
foo = find_block(top, "foo")
- def test_noops(self):
- # Check methods that don't work. They should warn and return False.
- def check(w, msg):
- self.assertEqual(str(w.message), msg)
- sym = self.top.lookup("glob")
- with test_support.check_warnings() as w:
- warnings.simplefilter("always", DeprecationWarning)
- self.assertFalse(sym.is_vararg())
- check(w, "is_vararg() is obsolete and will be removed")
- w.reset()
- self.assertFalse(sym.is_keywordarg())
- check(w, "is_keywordarg() is obsolete and will be removed")
- w.reset()
- self.assertFalse(sym.is_in_tuple())
- check(w, "is_in_tuple() is obsolete and will be removed")
-
def test_type(self):
self.assertEqual(self.top.get_type(), "module")
self.assertEqual(self.Mine.get_type(), "class")
diff --git a/Misc/NEWS b/Misc/NEWS
index 77fa493..ae53fcd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -165,6 +165,10 @@ Core and Builtins
Library
-------
+
+- Deprecated methods of symtable.Symbol have been removed: is_keywordarg(),
+ is_vararg(), and is_in_tuple().
+
- Issue #5316: Fixed buildbot failures introduced by multiple inheritance
in Distutils tests.