return sets instead of tuples from some symtable methods

diff --git a/Doc/library/symtable.rst b/Doc/library/symtable.rst
index ee2482377decf39725a55cee727de85366e8c8fd..4bb59e87f7caed688778109c463391ce16d317cc 100644 (file)
--- a/Doc/library/symtable.rst
+++ b/Doc/library/symtable.rst
@@ -95,19 +95,19 @@ Examining Symbol Tables
 
    .. method:: get_parameters()
 
-      Return a tuple containing names of parameters to this function.
+      Return a set containing names of parameters to this function.
 
    .. method:: get_locals()
 
-      Return a tuple containing names of locals in this function.
+      Return a set containing names of locals in this function.
 
    .. method:: get_globals()
 
-      Return a tuple containing names of globals in this function.
+      Return a set containing names of globals in this function.
 
    .. method:: get_frees()
 
-      Return a tuple containing names of free variables in this function.
+      Return a set containing names of free variables in this function.
 
 
 .. class:: Class
@@ -116,7 +116,7 @@ Examining Symbol Tables
 
    .. method:: get_methods()
 
-      Return a tuple containing the names of methods declared in the class.
+      Return a set containing the names of methods declared in the class.
 
 
 .. class:: Symbol

diff --git a/Lib/symtable.py b/Lib/symtable.py
index 3d1775b2f2cdd6e1a9d45789121fab6e0ba2274d..ac9396c4f8256e710b051284b6022dea82e6f478 100644 (file)
--- a/Lib/symtable.py
+++ b/Lib/symtable.py
@@ -129,8 +129,8 @@ class Function(SymbolTable):
     __globals = None
 
     def __idents_matching(self, test_func):
-        return tuple([ident for ident in self.get_identifiers()
-                      if test_func(self._table.symbols[ident])])
+        return frozenset(ident for ident in self.get_identifiers()
+                         if test_func(self._table.symbols[ident]))
 
     def get_parameters(self):
         if self.__params is None:
@@ -165,7 +165,7 @@ class Class(SymbolTable):
             d = {}
             for st in self._table.children:
                 d[st.name] = 1
-            self.__methods = tuple(d)
+            self.__methods = frozenset(d)
         return self.__methods
 
 

diff --git a/Lib/test/test_symtable.py b/Lib/test/test_symtable.py
index 7e0206d719102091ba0762a8a09f9d48638cd930..712eca7189a654343b96343aaf9880ee46b39e61 100644 (file)
--- a/Lib/test/test_symtable.py
+++ b/Lib/test/test_symtable.py
@@ -80,11 +80,11 @@ class SymtableTest(unittest.TestCase):
 
     def test_function_info(self):
         func = self.spam
-        self.assertEqual(func.get_parameters(), ("a", "b", "kw", "var"))
+        self.assertEqual(func.get_parameters(), {"a", "b", "kw", "var"})
         self.assertEqual(func.get_locals(),
-                         ("a", "b", "bar", "glob", "internal", "kw", "var", "x"))
-        self.assertEqual(func.get_globals(), ("bar", "glob"))
-        self.assertEqual(self.internal.get_frees(), ("x",))
+                         {"a", "b", "bar", "glob", "internal", "kw", "var", "x"})
+        self.assertEqual(func.get_globals(), {"bar", "glob"})
+        self.assertEqual(self.internal.get_frees(), {"x"})
 
     def test_globals(self):
         self.assertTrue(self.spam.lookup("glob").is_global())
@@ -142,7 +142,7 @@ class SymtableTest(unittest.TestCase):
         self.assertEqual(self.Mine.get_name(), "Mine")
 
     def test_class_info(self):
-        self.assertEqual(self.Mine.get_methods(), ('a_method',))
+        self.assertEqual(self.Mine.get_methods(), {'a_method'})
 
     def test_filename_correct(self):
         ### Bug tickler: SyntaxError file name correct whether error raised

diff --git a/Misc/NEWS b/Misc/NEWS
index 3d10f6ee55cac8927e11f0d4998b9c17c970f0ca..096f9a104763ecc6ccc95132cddc1d8a0482aa2a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -249,6 +249,9 @@ Extension Modules
 Library
 -------
 
+- symtable.Function's ``get_locals()``, ``get_globals()``, ``get_parameters()``,
+  and ``get_frees()`` and symtable.Class's ``get_methods()`` now return sets.
+
 - The methods ``is_in_tuple()``, ``is_vararg()``, and ``is_keywordarg()`` of
   symtable.Symbol have been removed.