From e57000338f81ad09d5aa1d846ac2f8a39850b5e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sat, 7 Jun 2003 20:17:11 +0000 Subject: Patch #750542: Use issubclass instead of type identity. --- Lib/pprint.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Lib/pprint.py b/Lib/pprint.py index 16d8eae..b8c0e88 100644 --- a/Lib/pprint.py +++ b/Lib/pprint.py @@ -130,7 +130,7 @@ class PrettyPrinter: write = stream.write if sepLines: - if typ is dict: + if issubclass(typ, dict): write('{') if self._indent_per_level > 1: write((self._indent_per_level - 1) * ' ') @@ -157,8 +157,8 @@ class PrettyPrinter: write('}') return - if typ is list or typ is tuple: - if typ is list: + if issubclass(typ, list) or issubclass(typ, tuple): + if issubclass(typ, list): write('[') endchar = ']' else: @@ -179,7 +179,7 @@ class PrettyPrinter: allowance + 1, context, level) indent = indent - self._indent_per_level del context[objid] - if typ is tuple and length == 1: + if issubclass(typ, 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 typ is str: + if issubclass(typ, basestring): 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 typ is dict: + if issubclass(typ, 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 typ is list or typ is tuple: - if typ is list: + if issubclass(typ, list) or issubclass(typ, tuple): + if issubclass(typ, list): if not object: return "[]", True, False format = "[%s]" -- cgit v0.12