summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2003-06-07 20:47:37 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2003-06-07 20:47:37 (GMT)
commitd02879d620de5922c211caaf7d7a6b2b7b8c64eb (patch)
tree6d32298ff3d203a25a99dc3d3adbd2e1e8d02d71
parente57000338f81ad09d5aa1d846ac2f8a39850b5e3 (diff)
downloadcpython-d02879d620de5922c211caaf7d7a6b2b7b8c64eb.zip
cpython-d02879d620de5922c211caaf7d7a6b2b7b8c64eb.tar.gz
cpython-d02879d620de5922c211caaf7d7a6b2b7b8c64eb.tar.bz2
Revert 1.25, as overloaded __repr__ is not considered.
-rw-r--r--Lib/pprint.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/Lib/pprint.py b/Lib/pprint.py
index b8c0e88..16d8eae 100644
--- a/Lib/pprint.py
+++ b/Lib/pprint.py
@@ -130,7 +130,7 @@ class PrettyPrinter:
write = stream.write
if sepLines:
- if issubclass(typ, dict):
+ if typ is dict:
write('{')
if self._indent_per_level > 1:
write((self._indent_per_level - 1) * ' ')
@@ -157,8 +157,8 @@ class PrettyPrinter:
write('}')
return
- if issubclass(typ, list) or issubclass(typ, tuple):
- if issubclass(typ, list):
+ if typ is list or typ is tuple:
+ if typ is list:
write('[')
endchar = ']'
else:
@@ -179,7 +179,7 @@ class PrettyPrinter:
allowance + 1, context, level)
indent = indent - self._indent_per_level
del context[objid]
- if issubclass(typ, tuple) and length == 1:
+ if typ is tuple and length == 1:
write(',')
write(endchar)
return
@@ -207,7 +207,7 @@ class PrettyPrinter:
def _safe_repr(object, context, maxlevels, level):
typ = _type(object)
- if issubclass(typ, basestring):
+ if typ is str:
if 'locale' not in _sys.modules:
return `object`, True, False
if "'" in object and '"' not in object:
@@ -226,7 +226,7 @@ def _safe_repr(object, context, maxlevels, level):
write(qget(char, `char`[1:-1]))
return ("%s%s%s" % (closure, sio.getvalue(), closure)), True, False
- if issubclass(typ, dict):
+ if typ is dict:
if not object:
return "{}", True, False
objid = _id(object)
@@ -251,8 +251,8 @@ def _safe_repr(object, context, maxlevels, level):
del context[objid]
return "{%s}" % _commajoin(components), readable, recursive
- if issubclass(typ, list) or issubclass(typ, tuple):
- if issubclass(typ, list):
+ if typ is list or typ is tuple:
+ if typ is list:
if not object:
return "[]", True, False
format = "[%s]"