summaryrefslogtreecommitdiffstats
path: root/Lib/unittest
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-11-10 21:34:48 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-11-10 21:34:48 (GMT)
commitc63ecee6c33156cbae1f985d49f6aa995af04f21 (patch)
treea4d2c7b066ec4ce2bba6d789383f584c7905b9ed /Lib/unittest
parentadf6a6c8421b12ef84b25b1b7628226912051cc2 (diff)
downloadcpython-c63ecee6c33156cbae1f985d49f6aa995af04f21.zip
cpython-c63ecee6c33156cbae1f985d49f6aa995af04f21.tar.gz
cpython-c63ecee6c33156cbae1f985d49f6aa995af04f21.tar.bz2
Merged revisions 76196 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r76196 | antoine.pitrou | 2009-11-10 21:49:30 +0100 (mar., 10 nov. 2009) | 8 lines Issue #7197: Allow unittest.TextTestRunner objects to be pickled and unpickled. This fixes crashes under Windows when trying to run test_multiprocessing in verbose mode. Additionally, Test_TextTestRunner hadn't been enabled in test_unittest. ........
Diffstat (limited to 'Lib/unittest')
-rw-r--r--Lib/unittest/runner.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py
index ea3c585..3ed9447 100644
--- a/Lib/unittest/runner.py
+++ b/Lib/unittest/runner.py
@@ -12,6 +12,8 @@ class _WritelnDecorator(object):
self.stream = stream
def __getattr__(self, attr):
+ if attr in ('stream', '__getstate__'):
+ raise AttributeError(attr)
return getattr(self.stream,attr)
def writeln(self, arg=None):