[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

[benjamin.peterson]

http://hg.python.org/cpython/rev/d2b4150c1885
changeset:   74255:d2b4150c1885
parent:      74251:65ac469d30e6
parent:      74254:a78d7926c35d
user:        Benjamin Peterson <benjamin at python.org>
date:        Tue Jan 03 16:26:34 2012 -0600
summary:
  merge 3.2

files:
  Doc/library/socketserver.rst |  2 +-
  Lib/test/test_symtable.py    |  8 ++++----
  2 files changed, 5 insertions(+), 5 deletions(-)


diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
--- a/Doc/library/socketserver.rst
+++ b/Doc/library/socketserver.rst
@@ -172,7 +172,7 @@
 
 .. method:: BaseServer.shutdown()
 
-   Tell the :meth:`serve_forever` loop to stop and waits until it does.
+   Tell the :meth:`serve_forever` loop to stop and wait until it does.
 
 
 .. attribute:: BaseServer.address_family
diff --git a/Lib/test/test_symtable.py b/Lib/test/test_symtable.py
--- a/Lib/test/test_symtable.py
+++ b/Lib/test/test_symtable.py
@@ -80,10 +80,10 @@
 
     def test_function_info(self):
         func = self.spam
-        self.assertEqual(func.get_parameters(), ("a", "b", "kw", "var"))
-        self.assertEqual(func.get_locals(),
-                         ("a", "b", "internal", "kw", "var", "x"))
-        self.assertEqual(func.get_globals(), ("bar", "glob"))
+        self.assertEqual(sorted(func.get_parameters()), ["a", "b", "kw", "var"])
+        expected = ["a", "b", "internal", "kw", "var", "x"]
+        self.assertEqual(sorted(func.get_locals()), expected)
+        self.assertEqual(sorted(func.get_globals()), ["bar", "glob"])
         self.assertEqual(self.internal.get_frees(), ("x",))
 
     def test_globals(self):

-- 
Repository URL: http://hg.python.org/cpython