From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 3 Jan 2012 22:24:39 +0000 (-0600)
Subject: merge 3.1
X-Git-Tag: v3.2.3rc1~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8d7037e32499bc9593c86668ae99f21d9e7d53a;p=python

merge 3.1
---

a8d7037e32499bc9593c86668ae99f21d9e7d53a
diff --cc Lib/test/test_symtable.py
index 7fb368abc2,882fa6f04a..335b4dc15f
--- a/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):