summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-11-10 21:39:25 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-11-10 21:39:25 (GMT)
commit47dded644fecab52c6543bcabb67807ea201d710 (patch)
tree81e9fd96bd612b1b3f42708ddf8e96cbcbaaa413
parent0734c632d583578a52e83cd88063a95455436b83 (diff)
downloadcpython-47dded644fecab52c6543bcabb67807ea201d710.zip
cpython-47dded644fecab52c6543bcabb67807ea201d710.tar.gz
cpython-47dded644fecab52c6543bcabb67807ea201d710.tar.bz2
Backport micro-fix from the py3k svnmerge
-rw-r--r--Lib/unittest/runner.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py
index 99819df..3afbc0e 100644
--- a/Lib/unittest/runner.py
+++ b/Lib/unittest/runner.py
@@ -12,7 +12,7 @@ class _WritelnDecorator(object):
self.stream = stream
def __getattr__(self, attr):
- if attr == 'stream':
+ if attr in ('stream', '__getstate__'):
raise AttributeError(attr)
return getattr(self.stream,attr)