Merged revisions 74609,74627,74634,74645,74651,74738,74840,75016,75316-75317,75323-75324,75326,75328,75330,75338,75340-75341,75343,75352-75353,75355,75357,75359 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k
................
r74609 | senthil.kumaran | 2009-08-31 18:43:45 +0200 (Mo, 31 Aug 2009) | 3 lines
Doc fix for issue2637.
................
r74627 | georg.brandl | 2009-09-02 22:31:26 +0200 (Mi, 02 Sep 2009) | 1 line
#6819: fix typo.
................
r74634 | georg.brandl | 2009-09-03 14:34:10 +0200 (Do, 03 Sep 2009) | 9 lines
Merged revisions 74633 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74633 | georg.brandl | 2009-09-03 14:31:39 +0200 (Do, 03 Sep 2009) | 1 line
#6757: complete the list of types that marshal can serialize.
........
................
r74645 | georg.brandl | 2009-09-04 10:07:32 +0200 (Fr, 04 Sep 2009) | 1 line
#5221: fix related topics: SEQUENCEMETHODS[12] doesnt exist any more.
................
r74651 | georg.brandl | 2009-09-04 13:20:54 +0200 (Fr, 04 Sep 2009) | 9 lines
Recorded merge of revisions 74650 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74650 | georg.brandl | 2009-09-04 13:19:34 +0200 (Fr, 04 Sep 2009) | 1 line
#5101: add back tests to test_funcattrs that were lost during unittest conversion, and make some PEP8 cleanups.
........
................
r74738 | georg.brandl | 2009-09-09 18:51:05 +0200 (Mi, 09 Sep 2009) | 9 lines
Merged revisions 74737 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74737 | georg.brandl | 2009-09-09 18:49:13 +0200 (Mi, 09 Sep 2009) | 1 line
Properly document copy and deepcopy as functions.
........
................
r74840 | georg.brandl | 2009-09-16 18:40:45 +0200 (Mi, 16 Sep 2009) | 13 lines
Merged revisions 74838-74839 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74838 | georg.brandl | 2009-09-16 18:22:12 +0200 (Mi, 16 Sep 2009) | 1 line
Remove some more boilerplate from the actual tests in test_pdb.
........
r74839 | georg.brandl | 2009-09-16 18:36:39 +0200 (Mi, 16 Sep 2009) | 1 line
Make the pdb displayhook compatible with the standard displayhook: do not print Nones. Add a test for that.
........
................
r75016 | georg.brandl | 2009-09-22 15:53:14 +0200 (Di, 22 Sep 2009) | 1 line
#6969: make it explicit that configparser writes/reads text files, and fix the example.
................
r75316 | georg.brandl | 2009-10-10 23:12:35 +0200 (Sa, 10 Okt 2009) | 9 lines
Merged revisions 75313 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75313 | georg.brandl | 2009-10-10 23:07:35 +0200 (Sa, 10 Okt 2009) | 1 line
Bring old demo up-to-date.
........
................
r75317 | georg.brandl | 2009-10-10 23:13:21 +0200 (Sa, 10 Okt 2009) | 9 lines
Merged revisions 75315 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75315 | georg.brandl | 2009-10-10 23:10:05 +0200 (Sa, 10 Okt 2009) | 1 line
Remove unneeded "L" suffixes.
........
................
r75323 | georg.brandl | 2009-10-10 23:48:05 +0200 (Sa, 10 Okt 2009) | 9 lines
Recorded merge of revisions 75321 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75321 | georg.brandl | 2009-10-10 23:43:21 +0200 (Sa, 10 Okt 2009) | 1 line
Remove outdated comment and fix a few style issues.
........
................
r75324 | georg.brandl | 2009-10-10 23:49:24 +0200 (Sa, 10 Okt 2009) | 9 lines
Merged revisions 75322 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75322 | georg.brandl | 2009-10-10 23:47:31 +0200 (Sa, 10 Okt 2009) | 1 line
Show use of range() step argument nicely.
........
................
r75326 | georg.brandl | 2009-10-10 23:57:03 +0200 (Sa, 10 Okt 2009) | 9 lines
Merged revisions 75325 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75325 | georg.brandl | 2009-10-10 23:55:11 +0200 (Sa, 10 Okt 2009) | 1 line
Modernize factorisation demo (mostly augassign.)
........
................
r75328 | georg.brandl | 2009-10-11 00:05:26 +0200 (So, 11 Okt 2009) | 9 lines
Merged revisions 75327 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75327 | georg.brandl | 2009-10-11 00:03:43 +0200 (So, 11 Okt 2009) | 1 line
Style fixes.
........
................
r75330 | georg.brandl | 2009-10-11 00:32:28 +0200 (So, 11 Okt 2009) | 9 lines
Merged revisions 75329 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75329 | georg.brandl | 2009-10-11 00:26:45 +0200 (So, 11 Okt 2009) | 1 line
Modernize all around (dont ask me how useful that script is nowadays...)
........
................
r75338 | georg.brandl | 2009-10-11 10:31:41 +0200 (So, 11 Okt 2009) | 9 lines
Merged revisions 75337 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75337 | georg.brandl | 2009-10-11 10:18:44 +0200 (So, 11 Okt 2009) | 1 line
Update morse script, avoid globals, use iterators.
........
................
r75340 | georg.brandl | 2009-10-11 10:42:09 +0200 (So, 11 Okt 2009) | 9 lines
Merged revisions 75339 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75339 | georg.brandl | 2009-10-11 10:39:16 +0200 (So, 11 Okt 2009) | 1 line
Update markov demo.
........
................
r75341 | georg.brandl | 2009-10-11 10:43:08 +0200 (So, 11 Okt 2009) | 1 line
Fix README description.
................
r75343 | georg.brandl | 2009-10-11 10:46:56 +0200 (So, 11 Okt 2009) | 9 lines
Merged revisions 75342 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75342 | georg.brandl | 2009-10-11 10:45:03 +0200 (So, 11 Okt 2009) | 1 line
Remove useless script "mkrcs" and update README.
........
................
r75352 | georg.brandl | 2009-10-11 14:04:10 +0200 (So, 11 Okt 2009) | 9 lines
Merged revisions 75350 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75350 | georg.brandl | 2009-10-11 14:00:18 +0200 (So, 11 Okt 2009) | 1 line
Use getopt in script.py demo.
........
................
r75353 | georg.brandl | 2009-10-11 14:04:40 +0200 (So, 11 Okt 2009) | 9 lines
Merged revisions 75351 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75351 | georg.brandl | 2009-10-11 14:03:01 +0200 (So, 11 Okt 2009) | 1 line
Fix variable.
........
................
r75355 | georg.brandl | 2009-10-11 16:27:51 +0200 (So, 11 Okt 2009) | 9 lines
Merged revisions 75354 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75354 | georg.brandl | 2009-10-11 16:23:49 +0200 (So, 11 Okt 2009) | 1 line
Update lpwatch script.
........
................
r75357 | georg.brandl | 2009-10-11 16:50:57 +0200 (So, 11 Okt 2009) | 9 lines
Merged revisions 75356 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75356 | georg.brandl | 2009-10-11 16:49:37 +0200 (So, 11 Okt 2009) | 1 line
Remove ftpstats script, the daemon whose log files it reads is long gone.
........
................
r75359 | georg.brandl | 2009-10-11 17:56:06 +0200 (So, 11 Okt 2009) | 9 lines
Merged revisions 75358 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75358 | georg.brandl | 2009-10-11 17:06:44 +0200 (So, 11 Okt 2009) | 1 line
Overhaul of Demo/xml.
........
................
diff --git a/Lib/test/test_funcattrs.py b/Lib/test/test_funcattrs.py
index 5765b4e..d1d03a3 100644
--- a/Lib/test/test_funcattrs.py
+++ b/Lib/test/test_funcattrs.py
@@ -56,8 +56,29 @@
self.assertEqual(test(), 3) # self.b always returns 3, arbitrarily
def test___globals__(self):
- self.assertEqual(self.b.__globals__, globals())
- self.cannot_set_attr(self.b, '__globals__', 2, (AttributeError, TypeError))
+ self.assertIs(self.b.__globals__, globals())
+ self.cannot_set_attr(self.b, '__globals__', 2,
+ (AttributeError, TypeError))
+
+ def test___closure__(self):
+ a = 12
+ def f(): print(a)
+ c = f.__closure__
+ self.assertTrue(isinstance(c, tuple))
+ self.assertEqual(len(c), 1)
+ # don't have a type object handy
+ self.assertEqual(c[0].__class__.__name__, "cell")
+ self.cannot_set_attr(f, "__closure__", c, AttributeError)
+
+ def test_empty_cell(self):
+ def f(): print(a)
+ try:
+ f.__closure__[0].cell_contents
+ except ValueError:
+ pass
+ else:
+ self.fail("shouldn't be able to read an empty cell")
+ a = 12
def test___name__(self):
self.assertEqual(self.b.__name__, 'b')
@@ -90,16 +111,20 @@
self.assertEqual(c.__code__, d.__code__)
self.assertEqual(c(), 7)
# self.assertEqual(d(), 7)
- try: b.__code__ = c.__code__
- except ValueError: pass
- else: self.fail(
- "__code__ with different numbers of free vars should not be "
- "possible")
- try: e.__code__ = d.__code__
- except ValueError: pass
- else: self.fail(
- "__code__ with different numbers of free vars should not be "
- "possible")
+ try:
+ b.__code__ = c.__code__
+ except ValueError:
+ pass
+ else:
+ self.fail("__code__ with different numbers of free vars should "
+ "not be possible")
+ try:
+ e.__code__ = d.__code__
+ except ValueError:
+ pass
+ else:
+ self.fail("__code__ with different numbers of free vars should "
+ "not be possible")
def test_blank_func_defaults(self):
self.assertEqual(self.b.__defaults__, None)
@@ -120,13 +145,16 @@
self.assertEqual(first_func(3, 5), 8)
del second_func.__defaults__
self.assertEqual(second_func.__defaults__, None)
- try: second_func()
- except TypeError: pass
- else: self.fail(
- "func_defaults does not update; deleting it does not remove "
- "requirement")
+ try:
+ second_func()
+ except TypeError:
+ pass
+ else:
+ self.fail("__defaults__ does not update; deleting it does not "
+ "remove requirement")
-class ImplicitReferencesTest(FuncAttrsTest):
+
+class InstancemethodAttrTest(FuncAttrsTest):
def test___class__(self):
self.assertEqual(self.fi.a.__self__.__class__, self.F)
@@ -146,31 +174,45 @@
self.fi.id = types.MethodType(id, self.fi)
self.assertEqual(self.fi.id(), id(self.fi))
# Test usage
- try: self.fi.id.unknown_attr
- except AttributeError: pass
- else: self.fail("using unknown attributes should raise AttributeError")
+ try:
+ self.fi.id.unknown_attr
+ except AttributeError:
+ pass
+ else:
+ self.fail("using unknown attributes should raise AttributeError")
# Test assignment and deletion
self.cannot_set_attr(self.fi.id, 'unknown_attr', 2, AttributeError)
+
class ArbitraryFunctionAttrTest(FuncAttrsTest):
def test_set_attr(self):
self.b.known_attr = 7
self.assertEqual(self.b.known_attr, 7)
- try: self.fi.a.known_attr = 7
- except AttributeError: pass
- else: self.fail("setting attributes on methods should raise error")
+ try:
+ self.fi.a.known_attr = 7
+ except AttributeError:
+ pass
+ else:
+ self.fail("setting attributes on methods should raise error")
def test_delete_unknown_attr(self):
- try: del self.b.unknown_attr
- except AttributeError: pass
- else: self.fail("deleting unknown attribute should raise TypeError")
+ try:
+ del self.b.unknown_attr
+ except AttributeError:
+ pass
+ else:
+ self.fail("deleting unknown attribute should raise TypeError")
def test_unset_attr(self):
for func in [self.b, self.fi.a]:
- try: func.non_existent_attr
- except AttributeError: pass
- else: self.fail("using unknown attributes should raise "
- "AttributeError")
+ try:
+ func.non_existent_attr
+ except AttributeError:
+ pass
+ else:
+ self.fail("using unknown attributes should raise "
+ "AttributeError")
+
class FunctionDictsTest(FuncAttrsTest):
def test_setting_dict_to_invalid(self):
@@ -183,11 +225,11 @@
d = {'known_attr': 7}
self.b.__dict__ = d
# Test assignment
- self.assertEqual(d, self.b.__dict__)
+ self.assertIs(d, self.b.__dict__)
# ... and on all the different ways of referencing the method's func
self.F.a.__dict__ = d
- self.assertEqual(d, self.fi.a.__func__.__dict__)
- self.assertEqual(d, self.fi.a.__dict__)
+ self.assertIs(d, self.fi.a.__func__.__dict__)
+ self.assertIs(d, self.fi.a.__dict__)
# Test value
self.assertEqual(self.b.known_attr, 7)
self.assertEqual(self.b.__dict__['known_attr'], 7)
@@ -196,9 +238,12 @@
self.assertEqual(self.fi.a.known_attr, 7)
def test_delete___dict__(self):
- try: del self.b.__dict__
- except TypeError: pass
- else: self.fail("deleting function dictionary should raise TypeError")
+ try:
+ del self.b.__dict__
+ except TypeError:
+ pass
+ else:
+ self.fail("deleting function dictionary should raise TypeError")
def test_unassigned_dict(self):
self.assertEqual(self.b.__dict__, {})
@@ -209,6 +254,7 @@
d[self.b] = value
self.assertEqual(d[self.b], value)
+
class FunctionDocstringTest(FuncAttrsTest):
def test_set_docstring_attr(self):
self.assertEqual(self.b.__doc__, None)
@@ -224,6 +270,7 @@
del self.b.__doc__
self.assertEqual(self.b.__doc__, None)
+
def cell(value):
"""Create a cell containing the given value."""
def f():
@@ -242,6 +289,7 @@
a = 1729
return f.__closure__[0]
+
class CellTest(unittest.TestCase):
def test_comparison(self):
# These tests are here simply to exercise the comparison code;
@@ -254,6 +302,7 @@
self.assertTrue(cell(-36) == cell(-36.0))
self.assertTrue(cell(True) > empty_cell())
+
class StaticMethodAttrsTest(unittest.TestCase):
def test_func_attribute(self):
def f():
@@ -267,7 +316,7 @@
def test_main():
- support.run_unittest(FunctionPropertiesTest, ImplicitReferencesTest,
+ support.run_unittest(FunctionPropertiesTest, InstancemethodAttrTest,
ArbitraryFunctionAttrTest, FunctionDictsTest,
FunctionDocstringTest, CellTest,
StaticMethodAttrsTest)