merge 3.1

diff --cc Lib/test/test_symtable.py
index 7fb368abc280360357a8c093456a6147d68cf5e1,882fa6f04ae2b56a2742b14b7d42dbd2eed6ba6e..335b4dc15f2eb62ea9e4e95bef516ebaa0775251
--- 1/Lib/test/test_symtable.py
--- 2/Lib/test/test_symtable.py
+++ b/Lib/test/test_symtable.py
@@@ -80,10 -80,10 +80,10 @@@ 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_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", "bar", "glob", "internal", "kw", "var", "x"]
++        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):