traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.2

This commit is contained in:
Benjamin Peterson 2012-01-03 16:26:34 -06:00
parent f3ac50b778 a8d7037e32
commit c095956ca5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/socketserver.rst
View File

@ -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

8
Lib/test/test_symtable.py
View File

@ -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", "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):