1998-03-26 17:13:24 -04:00
|
|
|
# Author: Fred L. Drake, Jr.
|
2001-10-09 17:53:48 -03:00
|
|
|
# fdrake@acm.org
|
1997-04-15 21:49:59 -03:00
|
|
|
#
|
|
|
|
# This is a simple little module I wrote to make life easier. I didn't
|
|
|
|
# see anything quite like it in the library, though I may have overlooked
|
|
|
|
# something. I wrote this when I was trying to read some heavily nested
|
2000-07-16 09:04:32 -03:00
|
|
|
# tuples with fairly non-descriptive content. This is modeled very much
|
1997-04-15 21:49:59 -03:00
|
|
|
# after Lisp/Scheme - style pretty-printing of lists. If you find it
|
|
|
|
# useful, thank small children who sleep at night.
|
|
|
|
|
|
|
|
"""Support to pretty-print lists, tuples, & dictionaries recursively.
|
|
|
|
|
|
|
|
Very simple, but useful, especially in debugging data structures.
|
|
|
|
|
1997-04-16 13:59:30 -03:00
|
|
|
Classes
|
|
|
|
-------
|
|
|
|
|
|
|
|
PrettyPrinter()
|
|
|
|
Handle pretty-printing operations onto a stream using a configured
|
|
|
|
set of formatting parameters.
|
|
|
|
|
1997-04-15 21:49:59 -03:00
|
|
|
Functions
|
|
|
|
---------
|
|
|
|
|
|
|
|
pformat()
|
|
|
|
Format a Python object into a pretty-printed representation.
|
|
|
|
|
|
|
|
pprint()
|
2004-05-14 13:31:56 -03:00
|
|
|
Pretty-print a Python object to a stream [default is sys.stdout].
|
1997-04-15 21:49:59 -03:00
|
|
|
|
1997-04-16 13:59:30 -03:00
|
|
|
saferepr()
|
|
|
|
Generate a 'standard' repr()-like value, but protect against recursive
|
|
|
|
data structures.
|
1997-04-15 21:49:59 -03:00
|
|
|
|
|
|
|
"""
|
|
|
|
|
2013-03-23 16:30:39 -03:00
|
|
|
import re
|
2002-12-31 03:14:18 -04:00
|
|
|
import sys as _sys
|
2010-09-09 09:31:00 -03:00
|
|
|
from collections import OrderedDict as _OrderedDict
|
2007-08-08 22:03:29 -03:00
|
|
|
from io import StringIO as _StringIO
|
1997-04-16 13:59:30 -03:00
|
|
|
|
2001-02-11 22:00:42 -04:00
|
|
|
__all__ = ["pprint","pformat","isreadable","isrecursive","saferepr",
|
|
|
|
"PrettyPrinter"]
|
1997-04-16 13:59:30 -03:00
|
|
|
|
2001-11-01 13:50:38 -04:00
|
|
|
|
2013-10-02 05:56:18 -03:00
|
|
|
def pprint(object, stream=None, indent=1, width=80, depth=None, *,
|
|
|
|
compact=False):
|
2004-05-14 13:31:56 -03:00
|
|
|
"""Pretty-print a Python object to a stream [default is sys.stdout]."""
|
2003-12-03 16:26:05 -04:00
|
|
|
printer = PrettyPrinter(
|
2013-10-02 05:56:18 -03:00
|
|
|
stream=stream, indent=indent, width=width, depth=depth,
|
|
|
|
compact=compact)
|
1997-04-16 13:59:30 -03:00
|
|
|
printer.pprint(object)
|
|
|
|
|
2013-10-02 05:56:18 -03:00
|
|
|
def pformat(object, indent=1, width=80, depth=None, *, compact=False):
|
1997-04-16 13:59:30 -03:00
|
|
|
"""Format a Python object into a pretty-printed representation."""
|
2013-10-02 05:56:18 -03:00
|
|
|
return PrettyPrinter(indent=indent, width=width, depth=depth,
|
|
|
|
compact=compact).pformat(object)
|
1997-04-16 13:59:30 -03:00
|
|
|
|
2001-05-14 04:05:58 -03:00
|
|
|
def saferepr(object):
|
|
|
|
"""Version of repr() which can handle recursive data structures."""
|
2001-11-01 13:50:38 -04:00
|
|
|
return _safe_repr(object, {}, None, 0)[0]
|
1997-04-16 13:59:30 -03:00
|
|
|
|
1997-07-18 17:42:39 -03:00
|
|
|
def isreadable(object):
|
|
|
|
"""Determine if saferepr(object) is readable by eval()."""
|
2001-11-01 13:50:38 -04:00
|
|
|
return _safe_repr(object, {}, None, 0)[1]
|
1997-07-18 17:42:39 -03:00
|
|
|
|
|
|
|
def isrecursive(object):
|
|
|
|
"""Determine if object requires a recursive representation."""
|
2001-11-01 13:50:38 -04:00
|
|
|
return _safe_repr(object, {}, None, 0)[2]
|
1997-04-16 13:59:30 -03:00
|
|
|
|
2009-11-18 21:07:05 -04:00
|
|
|
class _safe_key:
|
|
|
|
"""Helper function for key functions when sorting unorderable objects.
|
|
|
|
|
|
|
|
The wrapped-object will fallback to an Py2.x style comparison for
|
|
|
|
unorderable types (sorting first comparing the type name and then by
|
|
|
|
the obj ids). Does not work recursively, so dict.items() must have
|
|
|
|
_safe_key applied to both the key and the value.
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
|
|
|
__slots__ = ['obj']
|
|
|
|
|
|
|
|
def __init__(self, obj):
|
|
|
|
self.obj = obj
|
|
|
|
|
|
|
|
def __lt__(self, other):
|
2012-07-21 06:17:38 -03:00
|
|
|
try:
|
|
|
|
rv = self.obj.__lt__(other.obj)
|
|
|
|
except TypeError:
|
|
|
|
rv = NotImplemented
|
|
|
|
|
2009-11-18 21:07:05 -04:00
|
|
|
if rv is NotImplemented:
|
2013-10-03 16:29:36 -03:00
|
|
|
rv = (str(type(self.obj)), id(self.obj)) < \
|
|
|
|
(str(type(other.obj)), id(other.obj))
|
2009-11-18 21:07:05 -04:00
|
|
|
return rv
|
|
|
|
|
|
|
|
def _safe_tuple(t):
|
|
|
|
"Helper function for comparing 2-tuples"
|
|
|
|
return _safe_key(t[0]), _safe_key(t[1])
|
|
|
|
|
1997-04-16 13:59:30 -03:00
|
|
|
class PrettyPrinter:
|
2013-10-02 05:56:18 -03:00
|
|
|
def __init__(self, indent=1, width=80, depth=None, stream=None, *,
|
|
|
|
compact=False):
|
1998-03-26 17:13:24 -04:00
|
|
|
"""Handle pretty printing operations onto a stream using a set of
|
|
|
|
configured parameters.
|
|
|
|
|
|
|
|
indent
|
|
|
|
Number of spaces to indent for each level of nesting.
|
|
|
|
|
|
|
|
width
|
|
|
|
Attempted maximum number of columns in the output.
|
|
|
|
|
|
|
|
depth
|
|
|
|
The maximum depth to print out nested structures.
|
|
|
|
|
|
|
|
stream
|
|
|
|
The desired output stream. If omitted (or false), the standard
|
|
|
|
output stream available at construction will be used.
|
|
|
|
|
2013-10-02 05:56:18 -03:00
|
|
|
compact
|
|
|
|
If true, several items will be combined in one line.
|
|
|
|
|
1998-03-26 17:13:24 -04:00
|
|
|
"""
|
|
|
|
indent = int(indent)
|
|
|
|
width = int(width)
|
2003-12-03 16:15:28 -04:00
|
|
|
assert indent >= 0, "indent must be >= 0"
|
2001-05-14 04:05:58 -03:00
|
|
|
assert depth is None or depth > 0, "depth must be > 0"
|
2003-12-03 16:15:28 -04:00
|
|
|
assert width, "width must be != 0"
|
2002-07-08 09:28:06 -03:00
|
|
|
self._depth = depth
|
|
|
|
self._indent_per_level = indent
|
|
|
|
self._width = width
|
2002-06-01 13:07:16 -03:00
|
|
|
if stream is not None:
|
2002-07-08 09:28:06 -03:00
|
|
|
self._stream = stream
|
1998-03-26 17:13:24 -04:00
|
|
|
else:
|
2002-12-31 03:14:18 -04:00
|
|
|
self._stream = _sys.stdout
|
2013-10-02 05:56:18 -03:00
|
|
|
self._compact = bool(compact)
|
1997-04-16 13:59:30 -03:00
|
|
|
|
|
|
|
def pprint(self, object):
|
2005-11-11 14:18:51 -04:00
|
|
|
self._format(object, self._stream, 0, 0, {}, 0)
|
|
|
|
self._stream.write("\n")
|
1997-04-16 13:59:30 -03:00
|
|
|
|
|
|
|
def pformat(self, object):
|
2002-12-31 03:14:18 -04:00
|
|
|
sio = _StringIO()
|
2002-07-08 09:28:06 -03:00
|
|
|
self._format(object, sio, 0, 0, {}, 0)
|
1998-03-26 17:13:24 -04:00
|
|
|
return sio.getvalue()
|
1997-04-16 13:59:30 -03:00
|
|
|
|
1997-07-18 17:42:39 -03:00
|
|
|
def isrecursive(self, object):
|
2002-12-31 03:14:18 -04:00
|
|
|
return self.format(object, {}, 0, 0)[2]
|
1997-07-18 17:42:39 -03:00
|
|
|
|
|
|
|
def isreadable(self, object):
|
2002-12-31 03:14:18 -04:00
|
|
|
s, readable, recursive = self.format(object, {}, 0, 0)
|
2002-04-02 01:08:35 -04:00
|
|
|
return readable and not recursive
|
1997-07-18 17:42:39 -03:00
|
|
|
|
2002-07-08 09:28:06 -03:00
|
|
|
def _format(self, object, stream, indent, allowance, context, level):
|
1998-03-26 17:13:24 -04:00
|
|
|
level = level + 1
|
2013-10-03 16:29:36 -03:00
|
|
|
objid = id(object)
|
2001-11-01 13:50:38 -04:00
|
|
|
if objid in context:
|
|
|
|
stream.write(_recursion(object))
|
2002-07-08 09:28:06 -03:00
|
|
|
self._recursive = True
|
|
|
|
self._readable = False
|
2001-11-01 13:50:38 -04:00
|
|
|
return
|
2002-07-08 09:28:06 -03:00
|
|
|
rep = self._repr(object, context, level - 1)
|
2013-10-03 16:29:36 -03:00
|
|
|
typ = type(object)
|
2013-03-23 16:30:39 -03:00
|
|
|
max_width = self._width - 1 - indent - allowance
|
2013-10-03 16:29:36 -03:00
|
|
|
sepLines = len(rep) > max_width
|
2001-11-01 13:50:38 -04:00
|
|
|
write = stream.write
|
|
|
|
|
|
|
|
if sepLines:
|
2004-11-15 09:51:41 -04:00
|
|
|
r = getattr(typ, "__repr__", None)
|
2010-09-09 09:31:00 -03:00
|
|
|
if issubclass(typ, dict):
|
2001-11-01 13:50:38 -04:00
|
|
|
write('{')
|
2002-07-08 09:28:06 -03:00
|
|
|
if self._indent_per_level > 1:
|
|
|
|
write((self._indent_per_level - 1) * ' ')
|
2013-10-03 16:29:36 -03:00
|
|
|
length = len(object)
|
2001-11-01 13:50:38 -04:00
|
|
|
if length:
|
|
|
|
context[objid] = 1
|
2002-07-08 09:28:06 -03:00
|
|
|
indent = indent + self._indent_per_level
|
2010-09-09 09:31:00 -03:00
|
|
|
if issubclass(typ, _OrderedDict):
|
|
|
|
items = list(object.items())
|
|
|
|
else:
|
|
|
|
items = sorted(object.items(), key=_safe_tuple)
|
2001-11-01 13:50:38 -04:00
|
|
|
key, ent = items[0]
|
2002-07-08 09:28:06 -03:00
|
|
|
rep = self._repr(key, context, level)
|
2001-11-01 13:50:38 -04:00
|
|
|
write(rep)
|
|
|
|
write(': ')
|
2013-10-03 16:29:36 -03:00
|
|
|
self._format(ent, stream, indent + len(rep) + 2,
|
2001-11-01 13:50:38 -04:00
|
|
|
allowance + 1, context, level)
|
|
|
|
if length > 1:
|
|
|
|
for key, ent in items[1:]:
|
2002-07-08 09:28:06 -03:00
|
|
|
rep = self._repr(key, context, level)
|
2001-11-28 01:49:39 -04:00
|
|
|
write(',\n%s%s: ' % (' '*indent, rep))
|
2013-10-03 16:29:36 -03:00
|
|
|
self._format(ent, stream, indent + len(rep) + 2,
|
2001-11-01 13:50:38 -04:00
|
|
|
allowance + 1, context, level)
|
2002-07-08 09:28:06 -03:00
|
|
|
indent = indent - self._indent_per_level
|
2001-11-01 13:50:38 -04:00
|
|
|
del context[objid]
|
|
|
|
write('}')
|
|
|
|
return
|
|
|
|
|
Merged revisions 60176-60209 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60178 | georg.brandl | 2008-01-21 22:05:49 +0100 (Mon, 21 Jan 2008) | 2 lines
#1715: include sub-extension modules in pydoc text output.
........
r60179 | georg.brandl | 2008-01-21 22:14:21 +0100 (Mon, 21 Jan 2008) | 2 lines
Add a "const" to make gcc happy.
........
r60180 | georg.brandl | 2008-01-21 22:19:07 +0100 (Mon, 21 Jan 2008) | 2 lines
Add the correct build dir when building with pydebug.
........
r60181 | georg.brandl | 2008-01-21 22:23:15 +0100 (Mon, 21 Jan 2008) | 3 lines
Patch #1720595: add T_BOOL to the range of structmember types.
Patch by Angelo Mottola, reviewed by MvL, tests by me.
........
r60182 | georg.brandl | 2008-01-21 22:28:32 +0100 (Mon, 21 Jan 2008) | 2 lines
Reformat some ugly code.
........
r60187 | brett.cannon | 2008-01-22 00:50:16 +0100 (Tue, 22 Jan 2008) | 4 lines
Make's MAKEFLAGS variable is set to a string containing the single-letter
arguments to Make. This means there are no hyphens. Fix the '-s' check to
silence distutils to now work.
........
r60188 | gregory.p.smith | 2008-01-22 01:19:41 +0100 (Tue, 22 Jan 2008) | 3 lines
accepts and closes issue #1221598: adds an optional callback to ftplib.FTP
storbinary() and storlines() methods.
........
r60189 | gregory.p.smith | 2008-01-22 02:12:02 +0100 (Tue, 22 Jan 2008) | 2 lines
Replace spam.acquire() try: ... finally: spam.release() with "with spam:"
........
r60190 | gregory.p.smith | 2008-01-22 02:20:42 +0100 (Tue, 22 Jan 2008) | 4 lines
- Fix Issue #1703448: A joined thread could show up in the
threading.enumerate() list after the join() for a brief period until
it actually exited.
........
r60193 | georg.brandl | 2008-01-22 08:53:31 +0100 (Tue, 22 Jan 2008) | 2 lines
Fix \xhh specs, #1889.
........
r60198 | christian.heimes | 2008-01-22 16:01:25 +0100 (Tue, 22 Jan 2008) | 1 line
Fixed a missing (X) in define
........
r60199 | christian.heimes | 2008-01-22 16:25:18 +0100 (Tue, 22 Jan 2008) | 2 lines
Don't repeat yourself
Added the macros PyModule_AddIntMacro and PyModule_AddStringMacro. They shorten PyModule_AddIntConstant(m, "AF_INET", AF_INET) to PyModule_AddIntMacro(m, AF_INET)
........
r60201 | raymond.hettinger | 2008-01-22 20:51:41 +0100 (Tue, 22 Jan 2008) | 1 line
Document when to use izip_longest().
........
r60202 | georg.brandl | 2008-01-22 20:56:03 +0100 (Tue, 22 Jan 2008) | 2 lines
Fix for #1087741 patch.
........
r60203 | raymond.hettinger | 2008-01-22 21:18:53 +0100 (Tue, 22 Jan 2008) | 1 line
Give zip() the same guarantee as izip() for left-to-right evaluation.
........
r60204 | raymond.hettinger | 2008-01-22 23:09:26 +0100 (Tue, 22 Jan 2008) | 1 line
Improve variable name in sample code
........
r60205 | gregory.p.smith | 2008-01-23 00:15:34 +0100 (Wed, 23 Jan 2008) | 2 lines
docstring and comment updates suggested by Giampaolo Rodola'
........
r60207 | raymond.hettinger | 2008-01-23 01:04:40 +0100 (Wed, 23 Jan 2008) | 1 line
Let pprint() support sets and frozensets (suggested by David Mertz).
........
r60208 | guido.van.rossum | 2008-01-23 02:18:27 +0100 (Wed, 23 Jan 2008) | 4 lines
I'm tired of these tests breaking at Google due to our large number of
users and groups in LDAP/NIS. So I'm limiting the extra-heavy part of
the tests to passwd/group files with at most 1000 entries.
........
2008-01-23 04:24:23 -04:00
|
|
|
if ((issubclass(typ, list) and r is list.__repr__) or
|
|
|
|
(issubclass(typ, tuple) and r is tuple.__repr__) or
|
|
|
|
(issubclass(typ, set) and r is set.__repr__) or
|
|
|
|
(issubclass(typ, frozenset) and r is frozenset.__repr__)
|
|
|
|
):
|
2013-10-03 16:29:36 -03:00
|
|
|
length = len(object)
|
2003-12-03 16:15:28 -04:00
|
|
|
if issubclass(typ, list):
|
2001-11-01 13:50:38 -04:00
|
|
|
write('[')
|
|
|
|
endchar = ']'
|
2013-10-02 05:40:49 -03:00
|
|
|
elif issubclass(typ, tuple):
|
|
|
|
write('(')
|
|
|
|
endchar = ')'
|
|
|
|
else:
|
Merged revisions 60245-60277 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60246 | guido.van.rossum | 2008-01-24 18:58:05 +0100 (Thu, 24 Jan 2008) | 2 lines
Fix test67.py from issue #1303614.
........
r60248 | raymond.hettinger | 2008-01-24 19:05:54 +0100 (Thu, 24 Jan 2008) | 1 line
Clean-up and speed-up code by accessing numerator/denominator directly. There's no reason to enforce readonliness
........
r60249 | raymond.hettinger | 2008-01-24 19:12:23 +0100 (Thu, 24 Jan 2008) | 1 line
Revert 60189 and restore performance.
........
r60250 | guido.van.rossum | 2008-01-24 19:21:02 +0100 (Thu, 24 Jan 2008) | 5 lines
News about recently fixed crashers:
- A few crashers fixed: weakref_in_del.py (issue #1377858);
loosing_dict_ref.py (issue #1303614, test67.py);
borrowed_ref_[34].py (not in tracker).
........
r60252 | thomas.heller | 2008-01-24 19:36:27 +0100 (Thu, 24 Jan 2008) | 7 lines
Use a PyDictObject again for the array type cache; retrieving items
from the WeakValueDictionary was slower by nearly a factor of 3.
To avoid leaks, weakref proxies for the array types are put into the
cache dict, with weakref callbacks that removes the entries when the
type goes away.
........
r60253 | thomas.heller | 2008-01-24 19:54:12 +0100 (Thu, 24 Jan 2008) | 2 lines
Replace Py_BuildValue with PyTuple_Pack because it is faster.
Also add a missing DECREF.
........
r60254 | raymond.hettinger | 2008-01-24 20:05:29 +0100 (Thu, 24 Jan 2008) | 1 line
Add support for trunc().
........
r60255 | thomas.heller | 2008-01-24 20:15:02 +0100 (Thu, 24 Jan 2008) | 5 lines
Invert the checks in get_[u]long and get_[u]longlong. The intent was
to not accept float types; the result was that integer-like objects
were not accepted.
Ported from release25-maint.
........
r60256 | raymond.hettinger | 2008-01-24 20:30:19 +0100 (Thu, 24 Jan 2008) | 1 line
Add support for int(r) just like the other numeric classes.
........
r60263 | raymond.hettinger | 2008-01-24 22:23:58 +0100 (Thu, 24 Jan 2008) | 1 line
Expand tests to include nested graph structures.
........
r60264 | raymond.hettinger | 2008-01-24 22:47:56 +0100 (Thu, 24 Jan 2008) | 1 line
Shorter pprint's for empty sets and frozensets. Fix indentation of frozensets. Add tests including two complex data structures.
........
r60265 | amaury.forgeotdarc | 2008-01-24 23:51:18 +0100 (Thu, 24 Jan 2008) | 14 lines
#1920: when considering a block starting by "while 0", the compiler optimized the
whole construct away, even when an 'else' clause is present::
while 0:
print("no")
else:
print("yes")
did not generate any code at all.
Now the compiler emits the 'else' block, like it already does for 'if' statements.
Will backport.
........
r60266 | amaury.forgeotdarc | 2008-01-24 23:59:25 +0100 (Thu, 24 Jan 2008) | 2 lines
News entry for r60265 (Issue 1920).
........
r60269 | raymond.hettinger | 2008-01-25 00:50:26 +0100 (Fri, 25 Jan 2008) | 1 line
More code cleanup. Remove unnecessary indirection to useless class methods.
........
r60270 | raymond.hettinger | 2008-01-25 01:21:54 +0100 (Fri, 25 Jan 2008) | 1 line
Add support for copy, deepcopy, and pickle.
........
r60271 | raymond.hettinger | 2008-01-25 01:33:45 +0100 (Fri, 25 Jan 2008) | 1 line
Mark todos and review comments.
........
r60272 | raymond.hettinger | 2008-01-25 02:13:12 +0100 (Fri, 25 Jan 2008) | 1 line
Add one other review comment.
........
r60273 | raymond.hettinger | 2008-01-25 02:23:38 +0100 (Fri, 25 Jan 2008) | 1 line
Fix-up signature for approximation.
........
r60274 | raymond.hettinger | 2008-01-25 02:46:33 +0100 (Fri, 25 Jan 2008) | 1 line
More design notes
........
r60276 | neal.norwitz | 2008-01-25 07:37:23 +0100 (Fri, 25 Jan 2008) | 6 lines
Make the test more robust by trying to reconnect up to 3 times
in case there were transient failures. This will hopefully silence
the buildbots for this test. As we find other tests that have a problem,
we can fix with a similar strategy assuming it is successful. It worked
on my box in a loop for 10+ runs where it would have an exception otherwise.
........
r60277 | neal.norwitz | 2008-01-25 09:04:16 +0100 (Fri, 25 Jan 2008) | 4 lines
Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64)
and eliminate a compiler warning in floatobject.c. There might be
a better way to go about this, but it should be good enough for now.
........
2008-01-25 07:23:10 -04:00
|
|
|
if not length:
|
2013-10-02 05:40:49 -03:00
|
|
|
write(rep)
|
Merged revisions 60245-60277 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60246 | guido.van.rossum | 2008-01-24 18:58:05 +0100 (Thu, 24 Jan 2008) | 2 lines
Fix test67.py from issue #1303614.
........
r60248 | raymond.hettinger | 2008-01-24 19:05:54 +0100 (Thu, 24 Jan 2008) | 1 line
Clean-up and speed-up code by accessing numerator/denominator directly. There's no reason to enforce readonliness
........
r60249 | raymond.hettinger | 2008-01-24 19:12:23 +0100 (Thu, 24 Jan 2008) | 1 line
Revert 60189 and restore performance.
........
r60250 | guido.van.rossum | 2008-01-24 19:21:02 +0100 (Thu, 24 Jan 2008) | 5 lines
News about recently fixed crashers:
- A few crashers fixed: weakref_in_del.py (issue #1377858);
loosing_dict_ref.py (issue #1303614, test67.py);
borrowed_ref_[34].py (not in tracker).
........
r60252 | thomas.heller | 2008-01-24 19:36:27 +0100 (Thu, 24 Jan 2008) | 7 lines
Use a PyDictObject again for the array type cache; retrieving items
from the WeakValueDictionary was slower by nearly a factor of 3.
To avoid leaks, weakref proxies for the array types are put into the
cache dict, with weakref callbacks that removes the entries when the
type goes away.
........
r60253 | thomas.heller | 2008-01-24 19:54:12 +0100 (Thu, 24 Jan 2008) | 2 lines
Replace Py_BuildValue with PyTuple_Pack because it is faster.
Also add a missing DECREF.
........
r60254 | raymond.hettinger | 2008-01-24 20:05:29 +0100 (Thu, 24 Jan 2008) | 1 line
Add support for trunc().
........
r60255 | thomas.heller | 2008-01-24 20:15:02 +0100 (Thu, 24 Jan 2008) | 5 lines
Invert the checks in get_[u]long and get_[u]longlong. The intent was
to not accept float types; the result was that integer-like objects
were not accepted.
Ported from release25-maint.
........
r60256 | raymond.hettinger | 2008-01-24 20:30:19 +0100 (Thu, 24 Jan 2008) | 1 line
Add support for int(r) just like the other numeric classes.
........
r60263 | raymond.hettinger | 2008-01-24 22:23:58 +0100 (Thu, 24 Jan 2008) | 1 line
Expand tests to include nested graph structures.
........
r60264 | raymond.hettinger | 2008-01-24 22:47:56 +0100 (Thu, 24 Jan 2008) | 1 line
Shorter pprint's for empty sets and frozensets. Fix indentation of frozensets. Add tests including two complex data structures.
........
r60265 | amaury.forgeotdarc | 2008-01-24 23:51:18 +0100 (Thu, 24 Jan 2008) | 14 lines
#1920: when considering a block starting by "while 0", the compiler optimized the
whole construct away, even when an 'else' clause is present::
while 0:
print("no")
else:
print("yes")
did not generate any code at all.
Now the compiler emits the 'else' block, like it already does for 'if' statements.
Will backport.
........
r60266 | amaury.forgeotdarc | 2008-01-24 23:59:25 +0100 (Thu, 24 Jan 2008) | 2 lines
News entry for r60265 (Issue 1920).
........
r60269 | raymond.hettinger | 2008-01-25 00:50:26 +0100 (Fri, 25 Jan 2008) | 1 line
More code cleanup. Remove unnecessary indirection to useless class methods.
........
r60270 | raymond.hettinger | 2008-01-25 01:21:54 +0100 (Fri, 25 Jan 2008) | 1 line
Add support for copy, deepcopy, and pickle.
........
r60271 | raymond.hettinger | 2008-01-25 01:33:45 +0100 (Fri, 25 Jan 2008) | 1 line
Mark todos and review comments.
........
r60272 | raymond.hettinger | 2008-01-25 02:13:12 +0100 (Fri, 25 Jan 2008) | 1 line
Add one other review comment.
........
r60273 | raymond.hettinger | 2008-01-25 02:23:38 +0100 (Fri, 25 Jan 2008) | 1 line
Fix-up signature for approximation.
........
r60274 | raymond.hettinger | 2008-01-25 02:46:33 +0100 (Fri, 25 Jan 2008) | 1 line
More design notes
........
r60276 | neal.norwitz | 2008-01-25 07:37:23 +0100 (Fri, 25 Jan 2008) | 6 lines
Make the test more robust by trying to reconnect up to 3 times
in case there were transient failures. This will hopefully silence
the buildbots for this test. As we find other tests that have a problem,
we can fix with a similar strategy assuming it is successful. It worked
on my box in a loop for 10+ runs where it would have an exception otherwise.
........
r60277 | neal.norwitz | 2008-01-25 09:04:16 +0100 (Fri, 25 Jan 2008) | 4 lines
Add prototypes to get the mathmodule.c to compile on OSF1 5.1 (Tru64)
and eliminate a compiler warning in floatobject.c. There might be
a better way to go about this, but it should be good enough for now.
........
2008-01-25 07:23:10 -04:00
|
|
|
return
|
2013-10-02 05:40:49 -03:00
|
|
|
if typ is set:
|
|
|
|
write('{')
|
|
|
|
endchar = '}'
|
|
|
|
else:
|
|
|
|
write(typ.__name__)
|
|
|
|
write('({')
|
|
|
|
endchar = '})'
|
2013-10-03 16:29:36 -03:00
|
|
|
indent += len(typ.__name__) + 1
|
2009-11-18 21:07:05 -04:00
|
|
|
object = sorted(object, key=_safe_key)
|
2002-07-08 09:28:06 -03:00
|
|
|
if self._indent_per_level > 1:
|
|
|
|
write((self._indent_per_level - 1) * ' ')
|
2001-11-01 13:50:38 -04:00
|
|
|
if length:
|
|
|
|
context[objid] = 1
|
2013-10-02 05:56:18 -03:00
|
|
|
self._format_items(object, stream,
|
|
|
|
indent + self._indent_per_level,
|
|
|
|
allowance + 1, context, level)
|
2001-11-01 13:50:38 -04:00
|
|
|
del context[objid]
|
2003-12-03 16:15:28 -04:00
|
|
|
if issubclass(typ, tuple) and length == 1:
|
2001-11-01 13:50:38 -04:00
|
|
|
write(',')
|
|
|
|
write(endchar)
|
|
|
|
return
|
|
|
|
|
2013-10-03 16:29:36 -03:00
|
|
|
if issubclass(typ, str) and len(object) > 0 and r is str.__repr__:
|
2014-12-20 14:57:15 -04:00
|
|
|
chunks = []
|
|
|
|
lines = object.splitlines(True)
|
|
|
|
if level == 1:
|
|
|
|
indent += 1
|
|
|
|
max_width -= 2
|
|
|
|
for i, line in enumerate(lines):
|
|
|
|
rep = repr(line)
|
|
|
|
if len(rep) <= max_width:
|
|
|
|
chunks.append(rep)
|
|
|
|
else:
|
|
|
|
# A list of alternating (non-space, space) strings
|
|
|
|
parts = re.split(r'(\s+)', line) + ['']
|
|
|
|
current = ''
|
|
|
|
for i in range(0, len(parts), 2):
|
|
|
|
part = parts[i] + parts[i+1]
|
|
|
|
candidate = current + part
|
|
|
|
if len(repr(candidate)) > max_width:
|
|
|
|
if current:
|
|
|
|
chunks.append(repr(current))
|
|
|
|
current = part
|
|
|
|
else:
|
|
|
|
current = candidate
|
|
|
|
if current:
|
|
|
|
chunks.append(repr(current))
|
|
|
|
if len(chunks) == 1:
|
|
|
|
write(rep)
|
|
|
|
return
|
|
|
|
if level == 1:
|
|
|
|
write('(')
|
|
|
|
for i, rep in enumerate(chunks):
|
2013-03-23 16:30:39 -03:00
|
|
|
if i > 0:
|
|
|
|
write('\n' + ' '*indent)
|
|
|
|
write(rep)
|
2014-12-20 14:57:15 -04:00
|
|
|
if level == 1:
|
|
|
|
write(')')
|
2013-03-23 16:30:39 -03:00
|
|
|
return
|
2001-11-01 13:50:38 -04:00
|
|
|
write(rep)
|
1997-04-15 21:49:59 -03:00
|
|
|
|
2013-10-02 05:56:18 -03:00
|
|
|
def _format_items(self, items, stream, indent, allowance, context, level):
|
|
|
|
write = stream.write
|
|
|
|
delimnl = ',\n' + ' ' * indent
|
|
|
|
delim = ''
|
|
|
|
width = max_width = self._width - indent - allowance + 2
|
|
|
|
for ent in items:
|
|
|
|
if self._compact:
|
|
|
|
rep = self._repr(ent, context, level)
|
2013-10-03 16:29:36 -03:00
|
|
|
w = len(rep) + 2
|
2013-10-02 05:56:18 -03:00
|
|
|
if width < w:
|
|
|
|
width = max_width
|
|
|
|
if delim:
|
|
|
|
delim = delimnl
|
|
|
|
if width >= w:
|
|
|
|
width -= w
|
|
|
|
write(delim)
|
|
|
|
delim = ', '
|
|
|
|
write(rep)
|
|
|
|
continue
|
|
|
|
write(delim)
|
|
|
|
delim = delimnl
|
|
|
|
self._format(ent, stream, indent, allowance, context, level)
|
|
|
|
|
2002-07-08 09:28:06 -03:00
|
|
|
def _repr(self, object, context, level):
|
2002-04-02 01:08:35 -04:00
|
|
|
repr, readable, recursive = self.format(object, context.copy(),
|
2002-07-08 09:28:06 -03:00
|
|
|
self._depth, level)
|
1998-03-26 17:13:24 -04:00
|
|
|
if not readable:
|
2002-07-08 09:28:06 -03:00
|
|
|
self._readable = False
|
2001-05-14 04:05:58 -03:00
|
|
|
if recursive:
|
2002-07-08 09:28:06 -03:00
|
|
|
self._recursive = True
|
1998-03-26 17:13:24 -04:00
|
|
|
return repr
|
1997-04-15 21:49:59 -03:00
|
|
|
|
2002-04-02 01:08:35 -04:00
|
|
|
def format(self, object, context, maxlevels, level):
|
|
|
|
"""Format object for a specific context, returning a string
|
|
|
|
and flags indicating whether the representation is 'readable'
|
|
|
|
and whether the object represents a recursive construct.
|
|
|
|
"""
|
|
|
|
return _safe_repr(object, context, maxlevels, level)
|
|
|
|
|
|
|
|
|
2001-05-14 04:05:58 -03:00
|
|
|
# Return triple (repr_string, isreadable, isrecursive).
|
1997-04-15 21:49:59 -03:00
|
|
|
|
2001-11-01 13:50:38 -04:00
|
|
|
def _safe_repr(object, context, maxlevels, level):
|
2013-10-03 16:29:36 -03:00
|
|
|
typ = type(object)
|
2003-06-07 17:47:37 -03:00
|
|
|
if typ is str:
|
2002-12-31 03:14:18 -04:00
|
|
|
if 'locale' not in _sys.modules:
|
2004-02-12 13:35:32 -04:00
|
|
|
return repr(object), True, False
|
2001-09-04 16:43:26 -03:00
|
|
|
if "'" in object and '"' not in object:
|
|
|
|
closure = '"'
|
|
|
|
quotes = {'"': '\\"'}
|
|
|
|
else:
|
|
|
|
closure = "'"
|
|
|
|
quotes = {"'": "\\'"}
|
2001-11-01 13:50:38 -04:00
|
|
|
qget = quotes.get
|
2002-12-31 03:14:18 -04:00
|
|
|
sio = _StringIO()
|
2001-11-01 13:50:38 -04:00
|
|
|
write = sio.write
|
2001-09-04 16:43:26 -03:00
|
|
|
for char in object:
|
|
|
|
if char.isalpha():
|
2001-11-01 13:50:38 -04:00
|
|
|
write(char)
|
2001-09-04 16:43:26 -03:00
|
|
|
else:
|
2004-02-12 13:35:32 -04:00
|
|
|
write(qget(char, repr(char)[1:-1]))
|
2002-04-07 03:36:23 -03:00
|
|
|
return ("%s%s%s" % (closure, sio.getvalue(), closure)), True, False
|
2001-11-01 13:50:38 -04:00
|
|
|
|
2004-11-15 09:51:41 -04:00
|
|
|
r = getattr(typ, "__repr__", None)
|
2003-12-03 16:15:28 -04:00
|
|
|
if issubclass(typ, dict) and r is dict.__repr__:
|
2001-11-01 13:50:38 -04:00
|
|
|
if not object:
|
2002-04-07 03:36:23 -03:00
|
|
|
return "{}", True, False
|
2013-10-03 16:29:36 -03:00
|
|
|
objid = id(object)
|
Merged revisions 63119-63128,63130-63131,63133,63135-63144,63146-63148,63151-63152,63155-63165,63167-63176,63181-63186,63188-63189 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63119 | benjamin.peterson | 2008-05-11 20:41:23 -0400 (Sun, 11 May 2008) | 2 lines
#2196 hasattr now allows SystemExit and KeyboardInterrupt to propagate
........
r63122 | benjamin.peterson | 2008-05-11 20:46:49 -0400 (Sun, 11 May 2008) | 2 lines
make message slightly more informative, so there's no chance of misunderstanding it
........
r63158 | ronald.oussoren | 2008-05-12 07:24:33 -0400 (Mon, 12 May 2008) | 5 lines
Remove references to platform 'mac'
The 'mac' platform (that is, os.name == 'mac') was used for the MacOS 9 port,
which is no longer supported (as of Python 2.4 IIRC).
........
r63159 | ronald.oussoren | 2008-05-12 07:31:05 -0400 (Mon, 12 May 2008) | 8 lines
MacOSX: remove dependency on Carbon package for urllib
This patch removes the dependency on the Carbon package from urllib.
The mac-specific code for getting proxy configuration is now writting in
Python using ctypes and uses the SystemConfiguration framework instead of
InternetConfig. Also provides a mac-specific implementation of proxy_bypass.
........
r63162 | eric.smith | 2008-05-12 10:00:01 -0400 (Mon, 12 May 2008) | 1 line
Added 'n' presentation type for integers.
........
r63164 | georg.brandl | 2008-05-12 12:26:52 -0400 (Mon, 12 May 2008) | 2 lines
#1713041: fix pprint's handling of maximum depth.
........
r63170 | georg.brandl | 2008-05-12 12:53:42 -0400 (Mon, 12 May 2008) | 2 lines
Fix parameter name for enumerate().
........
r63173 | georg.brandl | 2008-05-12 13:01:58 -0400 (Mon, 12 May 2008) | 2 lines
#2766: remove code without effect.
........
r63174 | georg.brandl | 2008-05-12 13:04:10 -0400 (Mon, 12 May 2008) | 3 lines
#2767: don't clear globs in run() call, since they could be needed in tearDown,
which clears them at the end.
........
r63175 | georg.brandl | 2008-05-12 13:14:51 -0400 (Mon, 12 May 2008) | 2 lines
#1760: try-except-finally is one statement since PEP 341.
........
r63186 | amaury.forgeotdarc | 2008-05-12 17:30:24 -0400 (Mon, 12 May 2008) | 2 lines
Sync code with documentation, and remove Win95 support in winsound module.
........
r63189 | amaury.forgeotdarc | 2008-05-12 18:21:39 -0400 (Mon, 12 May 2008) | 3 lines
Adapt test_pyclbr to the new version of urllib.py:
The new mac-specific functions must be ignored.
........
2008-05-15 23:54:33 -03:00
|
|
|
if maxlevels and level >= maxlevels:
|
2002-04-07 03:36:23 -03:00
|
|
|
return "{...}", False, objid in context
|
2001-11-01 13:50:38 -04:00
|
|
|
if objid in context:
|
2002-04-07 03:36:23 -03:00
|
|
|
return _recursion(object), False, True
|
2001-11-01 13:50:38 -04:00
|
|
|
context[objid] = 1
|
2002-04-07 03:36:23 -03:00
|
|
|
readable = True
|
|
|
|
recursive = False
|
2001-05-14 15:39:41 -03:00
|
|
|
components = []
|
2001-11-01 13:50:38 -04:00
|
|
|
append = components.append
|
|
|
|
level += 1
|
|
|
|
saferepr = _safe_repr
|
2009-11-18 21:07:05 -04:00
|
|
|
items = sorted(object.items(), key=_safe_tuple)
|
2006-08-23 21:41:19 -03:00
|
|
|
for k, v in items:
|
2001-11-01 13:50:38 -04:00
|
|
|
krepr, kreadable, krecur = saferepr(k, context, maxlevels, level)
|
|
|
|
vrepr, vreadable, vrecur = saferepr(v, context, maxlevels, level)
|
|
|
|
append("%s: %s" % (krepr, vrepr))
|
1998-03-26 17:13:24 -04:00
|
|
|
readable = readable and kreadable and vreadable
|
2001-11-01 13:50:38 -04:00
|
|
|
if krecur or vrecur:
|
2002-04-07 03:36:23 -03:00
|
|
|
recursive = True
|
2001-11-01 13:50:38 -04:00
|
|
|
del context[objid]
|
2013-10-03 16:29:36 -03:00
|
|
|
return "{%s}" % ", ".join(components), readable, recursive
|
2001-11-01 13:50:38 -04:00
|
|
|
|
2003-12-03 16:15:28 -04:00
|
|
|
if (issubclass(typ, list) and r is list.__repr__) or \
|
|
|
|
(issubclass(typ, tuple) and r is tuple.__repr__):
|
|
|
|
if issubclass(typ, list):
|
2001-11-01 13:50:38 -04:00
|
|
|
if not object:
|
2002-04-07 03:36:23 -03:00
|
|
|
return "[]", True, False
|
2001-11-01 13:50:38 -04:00
|
|
|
format = "[%s]"
|
2013-10-03 16:29:36 -03:00
|
|
|
elif len(object) == 1:
|
2001-11-01 13:50:38 -04:00
|
|
|
format = "(%s,)"
|
|
|
|
else:
|
|
|
|
if not object:
|
2002-04-07 03:36:23 -03:00
|
|
|
return "()", True, False
|
2001-11-01 13:50:38 -04:00
|
|
|
format = "(%s)"
|
2013-10-03 16:29:36 -03:00
|
|
|
objid = id(object)
|
Merged revisions 63119-63128,63130-63131,63133,63135-63144,63146-63148,63151-63152,63155-63165,63167-63176,63181-63186,63188-63189 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r63119 | benjamin.peterson | 2008-05-11 20:41:23 -0400 (Sun, 11 May 2008) | 2 lines
#2196 hasattr now allows SystemExit and KeyboardInterrupt to propagate
........
r63122 | benjamin.peterson | 2008-05-11 20:46:49 -0400 (Sun, 11 May 2008) | 2 lines
make message slightly more informative, so there's no chance of misunderstanding it
........
r63158 | ronald.oussoren | 2008-05-12 07:24:33 -0400 (Mon, 12 May 2008) | 5 lines
Remove references to platform 'mac'
The 'mac' platform (that is, os.name == 'mac') was used for the MacOS 9 port,
which is no longer supported (as of Python 2.4 IIRC).
........
r63159 | ronald.oussoren | 2008-05-12 07:31:05 -0400 (Mon, 12 May 2008) | 8 lines
MacOSX: remove dependency on Carbon package for urllib
This patch removes the dependency on the Carbon package from urllib.
The mac-specific code for getting proxy configuration is now writting in
Python using ctypes and uses the SystemConfiguration framework instead of
InternetConfig. Also provides a mac-specific implementation of proxy_bypass.
........
r63162 | eric.smith | 2008-05-12 10:00:01 -0400 (Mon, 12 May 2008) | 1 line
Added 'n' presentation type for integers.
........
r63164 | georg.brandl | 2008-05-12 12:26:52 -0400 (Mon, 12 May 2008) | 2 lines
#1713041: fix pprint's handling of maximum depth.
........
r63170 | georg.brandl | 2008-05-12 12:53:42 -0400 (Mon, 12 May 2008) | 2 lines
Fix parameter name for enumerate().
........
r63173 | georg.brandl | 2008-05-12 13:01:58 -0400 (Mon, 12 May 2008) | 2 lines
#2766: remove code without effect.
........
r63174 | georg.brandl | 2008-05-12 13:04:10 -0400 (Mon, 12 May 2008) | 3 lines
#2767: don't clear globs in run() call, since they could be needed in tearDown,
which clears them at the end.
........
r63175 | georg.brandl | 2008-05-12 13:14:51 -0400 (Mon, 12 May 2008) | 2 lines
#1760: try-except-finally is one statement since PEP 341.
........
r63186 | amaury.forgeotdarc | 2008-05-12 17:30:24 -0400 (Mon, 12 May 2008) | 2 lines
Sync code with documentation, and remove Win95 support in winsound module.
........
r63189 | amaury.forgeotdarc | 2008-05-12 18:21:39 -0400 (Mon, 12 May 2008) | 3 lines
Adapt test_pyclbr to the new version of urllib.py:
The new mac-specific functions must be ignored.
........
2008-05-15 23:54:33 -03:00
|
|
|
if maxlevels and level >= maxlevels:
|
2002-04-07 03:36:23 -03:00
|
|
|
return format % "...", False, objid in context
|
2001-11-01 13:50:38 -04:00
|
|
|
if objid in context:
|
2002-04-07 03:36:23 -03:00
|
|
|
return _recursion(object), False, True
|
2001-11-01 13:50:38 -04:00
|
|
|
context[objid] = 1
|
2002-04-07 03:36:23 -03:00
|
|
|
readable = True
|
|
|
|
recursive = False
|
2001-05-14 15:39:41 -03:00
|
|
|
components = []
|
2001-11-01 13:50:38 -04:00
|
|
|
append = components.append
|
|
|
|
level += 1
|
|
|
|
for o in object:
|
|
|
|
orepr, oreadable, orecur = _safe_repr(o, context, maxlevels, level)
|
|
|
|
append(orepr)
|
|
|
|
if not oreadable:
|
2002-04-07 03:36:23 -03:00
|
|
|
readable = False
|
2001-11-01 13:50:38 -04:00
|
|
|
if orecur:
|
2002-04-07 03:36:23 -03:00
|
|
|
recursive = True
|
2001-11-01 13:50:38 -04:00
|
|
|
del context[objid]
|
2013-10-03 16:29:36 -03:00
|
|
|
return format % ", ".join(components), readable, recursive
|
2001-11-13 17:51:26 -04:00
|
|
|
|
2004-02-12 13:35:32 -04:00
|
|
|
rep = repr(object)
|
2002-04-07 03:36:23 -03:00
|
|
|
return rep, (rep and not rep.startswith('<')), False
|
2001-11-01 13:50:38 -04:00
|
|
|
|
|
|
|
|
|
|
|
def _recursion(object):
|
|
|
|
return ("<Recursion on %s with id=%s>"
|
2013-10-03 16:29:36 -03:00
|
|
|
% (type(object).__name__, id(object)))
|
2001-11-01 13:50:38 -04:00
|
|
|
|
|
|
|
|
|
|
|
def _perfcheck(object=None):
|
|
|
|
import time
|
|
|
|
if object is None:
|
|
|
|
object = [("string", (1, 2), [3, 4], {5: 6, 7: 8})] * 100000
|
|
|
|
p = PrettyPrinter()
|
|
|
|
t1 = time.time()
|
|
|
|
_safe_repr(object, {}, None, 0)
|
|
|
|
t2 = time.time()
|
|
|
|
p.pformat(object)
|
|
|
|
t3 = time.time()
|
2007-02-09 01:37:30 -04:00
|
|
|
print("_safe_repr:", t2 - t1)
|
|
|
|
print("pformat:", t3 - t2)
|
2001-11-01 13:50:38 -04:00
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
_perfcheck()
|