[Python-checkins] (merge 3.1 -> 3.2): merge 3.1
benjamin.peterson
python-checkins at python.org
Mon Mar 7 01:02:52 CET 2011
http://hg.python.org/cpython/rev/fd0855e2c8cf
changeset: 68312:fd0855e2c8cf
branch: 3.2
parent: 68307:686df11f0a14
parent: 68310:7d442fd36c96
user: Benjamin Peterson <benjamin at python.org>
date: Sun Mar 06 18:04:10 2011 -0600
summary:
merge 3.1
files:
diff --git a/Lib/lib2to3/pytree.py b/Lib/lib2to3/pytree.py
--- a/Lib/lib2to3/pytree.py
+++ b/Lib/lib2to3/pytree.py
@@ -743,9 +743,11 @@
else:
# The reason for this is that hitting the recursion limit usually
# results in some ugly messages about how RuntimeErrors are being
- # ignored.
- save_stderr = sys.stderr
- sys.stderr = StringIO()
+ # ignored. We only have to do this on CPython, though, because other
+ # implementations don't have this nasty bug in the first place.
+ if hasattr(sys, "getrefcount"):
+ save_stderr = sys.stderr
+ sys.stderr = StringIO()
try:
for count, r in self._recursive_matches(nodes, 0):
if self.name:
@@ -759,7 +761,8 @@
r[self.name] = nodes[:count]
yield count, r
finally:
- sys.stderr = save_stderr
+ if hasattr(sys, "getrefcount"):
+ sys.stderr = save_stderr
def _iterative_matches(self, nodes):
"""Helper to iteratively yield the matches."""
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list