merge 3.2

benjaminp · benjaminp · commit c095956ca58b · 2012-01-03T16:26:34.000-06:00
diff --git a/Doc/library/socketserver.rst b/Doc/library/socketserver.rst
@@ -172,7 +172,7 @@ Server Objects
 
 .. 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
@@ -80,10 +80,10 @@ def test_lineno(self):
 
     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):
