From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 16 May 2015 18:38:05 +0000 (+0300)
Subject: Issue #18682: Optimized pprint functions for builtin scalar types.
X-Git-Tag: v3.5.0b1~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8eb1f077c2be03f72ef31ddd2cfe805ffbfbd524;p=thirdparty%2FPython%2Fcpython.git

Issue #18682: Optimized pprint functions for builtin scalar types.
---

diff --git a/Lib/pprint.py b/Lib/pprint.py
index e084dc62fe1c..87649b48cdfa 100644
--- a/Lib/pprint.py
+++ b/Lib/pprint.py
@@ -489,24 +489,8 @@ class PrettyPrinter:
 
 def _safe_repr(object, context, maxlevels, level):
     typ = type(object)
-    if typ is str:
-        if 'locale' not in _sys.modules:
-            return repr(object), True, False
-        if "'" in object and '"' not in object:
-            closure = '"'
-            quotes = {'"': '\\"'}
-        else:
-            closure = "'"
-            quotes = {"'": "\\'"}
-        qget = quotes.get
-        sio = _StringIO()
-        write = sio.write
-        for char in object:
-            if char.isalpha():
-                write(char)
-            else:
-                write(qget(char, repr(char)[1:-1]))
-        return ("%s%s%s" % (closure, sio.getvalue(), closure)), True, False
+    if typ in _builtin_scalars:
+        return repr(object), True, False
 
     r = getattr(typ, "__repr__", None)
     if issubclass(typ, dict) and r is dict.__repr__:
@@ -571,6 +555,8 @@ def _safe_repr(object, context, maxlevels, level):
     rep = repr(object)
     return rep, (rep and not rep.startswith('<')), False
 
+_builtin_scalars = frozenset({str, bytes, bytearray, int, float, complex,
+                              bool, type(None)})
 
 def _recursion(object):
     return ("<Recursion on %s with id=%s>"
diff --git a/Misc/NEWS b/Misc/NEWS
index a00d9677511c..1b23a9867aaf 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -47,6 +47,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #18682: Optimized pprint functions for builtin scalar types.
+
 - Issue #22027: smtplib now supports RFC 6531 (SMTPUTF8).
 
 - Issue #23488: Random generator objects now consume 2x less memory on 64-bit.