[Python-3000-checkins] r65907 - in python/branches/py3k: Doc/library/symtable.rst Lib/symtable.py Lib/test/test_symtable.py Misc/NEWS

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed Aug 20 14:55:31 2008
New Revision: 65907

Log:
revert 65897

Modified:
   python/branches/py3k/Doc/library/symtable.rst
   python/branches/py3k/Lib/symtable.py
   python/branches/py3k/Lib/test/test_symtable.py
   python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Doc/library/symtable.rst
==============================================================================
--- python/branches/py3k/Doc/library/symtable.rst	(original)
+++ python/branches/py3k/Doc/library/symtable.rst	Wed Aug 20 14:55:31 2008
@@ -95,19 +95,19 @@
 
    .. method:: get_parameters()
 
-      Return a set containing names of parameters to this function.
+      Return a tuple containing names of parameters to this function.
 
    .. method:: get_locals()
 
-      Return a set containing names of locals in this function.
+      Return a tuple containing names of locals in this function.
 
    .. method:: get_globals()
 
-      Return a set containing names of globals in this function.
+      Return a tuple containing names of globals in this function.
 
    .. method:: get_frees()
 
-      Return a set containing names of free variables in this function.
+      Return a tuple containing names of free variables in this function.
 
 
 .. class:: Class
@@ -116,7 +116,7 @@
 
    .. method:: get_methods()
 
-      Return a set containing the names of methods declared in the class.
+      Return a tuple containing the names of methods declared in the class.
 
 
 .. class:: Symbol

Modified: python/branches/py3k/Lib/symtable.py
==============================================================================
--- python/branches/py3k/Lib/symtable.py	(original)
+++ python/branches/py3k/Lib/symtable.py	Wed Aug 20 14:55:31 2008
@@ -128,8 +128,8 @@
     __globals = None
 
     def __idents_matching(self, test_func):
-        return frozenset(ident for ident in self.get_identifiers()
-                         if test_func(self._table.symbols[ident]))
+        return tuple([ident for ident in self.get_identifiers()
+                      if test_func(self._table.symbols[ident])])
 
     def get_parameters(self):
         if self.__params is None:
@@ -164,7 +164,7 @@
             d = {}
             for st in self._table.children:
                 d[st.name] = 1
-            self.__methods = frozenset(d)
+            self.__methods = tuple(d)
         return self.__methods
 
 

Modified: python/branches/py3k/Lib/test/test_symtable.py
==============================================================================
--- python/branches/py3k/Lib/test/test_symtable.py	(original)
+++ python/branches/py3k/Lib/test/test_symtable.py	Wed Aug 20 14:55:31 2008
@@ -80,11 +80,11 @@
 
     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 @@
         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

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Wed Aug 20 14:55:31 2008
@@ -249,9 +249,6 @@
 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.