[Python-checkins] r74651 - in python/branches/py3k: Lib/test/test_funcattrs.py
georg.brandl
python-checkins at python.org
Fri Sep 4 13:20:54 CEST 2009
Author: georg.brandl
Date: Fri Sep 4 13:20:54 2009
New Revision: 74651
Log:
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.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/test/test_funcattrs.py
Modified: python/branches/py3k/Lib/test/test_funcattrs.py
==============================================================================
--- python/branches/py3k/Lib/test/test_funcattrs.py (original)
+++ python/branches/py3k/Lib/test/test_funcattrs.py Fri Sep 4 13:20:54 2009
@@ -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)
More information about the Python-checkins
mailing list