mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-30 14:44:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

#1713041: fix pprint's handling of maximum depth.

Browse source
This commit is contained in:
Georg Brandl 2008-05-12 16:26:52 +00:00
parent 103f19d286
commit 23da6e6545
4 changed files with 26 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/pprint.py
View file

@ -131,6 +131,10 @@ class PrettyPrinter:
sepLines = _len(rep) > (self._width - 1 - indent - allowance)
write = stream.write
if self._depth and level > self._depth:
write(rep)
return
r = getattr(typ, "__repr__", None)
if issubclass(typ, dict) and r is dict.__repr__:
write('{')
@ -211,8 +215,8 @@ class PrettyPrinter:
write(',')
write(endchar)
return
write(rep)
write(rep)
def _repr(self, object, context, level):
repr, readable, recursive = self.format(object, context.copy(),
@ -259,7 +263,7 @@ def _safe_repr(object, context, maxlevels, level):
if not object:
return "{}", True, False
objid = _id(object)
if maxlevels and level > maxlevels:
if maxlevels and level >= maxlevels:
return "{...}", False, objid in context
if objid in context:
return _recursion(object), False, True
@ -293,7 +297,7 @@ def _safe_repr(object, context, maxlevels, level):
return "()", True, False
format = "(%s)"
objid = _id(object)
if maxlevels and level > maxlevels:
if maxlevels and level >= maxlevels:
return format % "...", False, objid in context
if objid in context:
return _recursion(object), False, True