diff options
| -rwxr-xr-x | Demo/pdist/cmptree.py | 2 | ||||
| -rwxr-xr-x | Demo/pdist/server.py | 2 | ||||
| -rw-r--r-- | Doc/library/reprlib.rst (renamed from Doc/library/repr.rst) | 13 | ||||
| -rw-r--r-- | Doc/tutorial/stdlib2.rst | 6 | ||||
| -rw-r--r-- | Lib/bdb.py | 6 | ||||
| -rw-r--r-- | Lib/copy.py | 19 | ||||
| -rw-r--r-- | Lib/idlelib/Debugger.py | 4 | ||||
| -rw-r--r-- | Lib/idlelib/ObjectBrowser.py | 2 | ||||
| -rwxr-xr-x | Lib/pdb.py | 2 | ||||
| -rwxr-xr-x | Lib/pydoc.py | 2 | ||||
| -rw-r--r-- | Lib/test/test___all__.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_repr.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
13 files changed, 35 insertions, 31 deletions
diff --git a/Demo/pdist/cmptree.py b/Demo/pdist/cmptree.py index 1e9f985e72..f804d31a0b 100755 --- a/Demo/pdist/cmptree.py +++ b/Demo/pdist/cmptree.py @@ -1,7 +1,7 @@ """Compare local and remote dictionaries and transfer differing files -- like rdist.""" import sys -from repr import repr +from reprlib import repr import FSProxy import time import os diff --git a/Demo/pdist/server.py b/Demo/pdist/server.py index 7e779712a9..b3943ff393 100755 --- a/Demo/pdist/server.py +++ b/Demo/pdist/server.py @@ -4,7 +4,7 @@ import sys import socket import pickle from fnmatch import fnmatch -from repr import repr +from reprlib import repr # Default verbosity (0 = silent, 1 = print connections, 2 = print requests too) diff --git a/Doc/library/repr.rst b/Doc/library/reprlib.rst index 3f7fc227a0..84fd6fb982 100644 --- a/Doc/library/repr.rst +++ b/Doc/library/reprlib.rst @@ -1,13 +1,13 @@ -:mod:`repr` --- Alternate :func:`repr` implementation +:mod:`reprlib` --- Alternate :func:`repr` implementation ===================================================== -.. module:: repr +.. module:: reprlib :synopsis: Alternate repr() implementation with size limits. .. sectionauthor:: Fred L. Drake, Jr. <fdrake@acm.org> -The :mod:`repr` module provides a means for producing object representations +The :mod:`reprlib` module provides a means for producing object representations with limits on the size of the resulting strings. This is used in the Python debugger and may be useful in other contexts as well. @@ -62,10 +62,13 @@ which format specific object types. default is ``4`` for :attr:`maxdict`, ``5`` for :attr:`maxarray`, and ``6`` for the others. + .. versionadded:: 2.4 + :attr:`maxset`, :attr:`maxfrozenset`, and :attr:`set`. + .. attribute:: Repr.maxlong - Maximum number of characters in the representation for an integer. Digits + Maximum number of characters in the representation for a long integer. Digits are dropped from the middle. The default is ``40``. @@ -129,5 +132,5 @@ for file objects could be added:: return `obj` aRepr = MyRepr() - print(aRepr.repr(sys.stdin)) # prints '<stdin>' + print aRepr.repr(sys.stdin) # prints '<stdin>' diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst index d519fc439e..33bc47a0d6 100644 --- a/Doc/tutorial/stdlib2.rst +++ b/Doc/tutorial/stdlib2.rst @@ -13,11 +13,11 @@ programming needs. These modules rarely occur in small scripts. Output Formatting ================= -The :mod:`repr` module provides a version of :func:`repr` customized for +The :mod:`reprlib` module provides a version of :func:`repr` customized for abbreviated displays of large or deeply nested containers:: - >>> import repr - >>> repr.repr(set('supercalifragilisticexpialidocious')) + >>> import reprlib + >>> reprlib.repr(set('supercalifragilisticexpialidocious')) "set(['a', 'c', 'd', 'e', 'f', 'g', ...])" The :mod:`pprint` module offers more sophisticated control over printing both diff --git a/Lib/bdb.py b/Lib/bdb.py index b8a20ece55..747e0929f0 100644 --- a/Lib/bdb.py +++ b/Lib/bdb.py @@ -324,7 +324,7 @@ class Bdb: # def format_stack_entry(self, frame_lineno, lprefix=': '): - import linecache, repr + import linecache, reprlib frame, lineno = frame_lineno filename = self.canonic(frame.f_code.co_filename) s = '%s(%r)' % (filename, lineno) @@ -337,13 +337,13 @@ class Bdb: else: args = None if args: - s = s + repr.repr(args) + s = s + reprlib.repr(args) else: s = s + '()' if '__return__' in frame.f_locals: rv = frame.f_locals['__return__'] s = s + '->' - s = s + repr.repr(rv) + s = s + reprlib.repr(rv) line = linecache.getline(filename, lineno) if line: s = s + lprefix + line.strip() return s diff --git a/Lib/copy.py b/Lib/copy.py index 899ee4d0ad..a334b7961b 100644 --- a/Lib/copy.py +++ b/Lib/copy.py @@ -354,17 +354,16 @@ def _test(): print(l2) l.append({l[1]: l, 'xyz': l[2]}) l3 = copy(l) - import repr - print(map(repr.repr, l)) - print(map(repr.repr, l1)) - print(map(repr.repr, l2)) - print(map(repr.repr, l3)) + import reprlib + print(map(reprlib.repr, l)) + print(map(reprlib.repr, l1)) + print(map(reprlib.repr, l2)) + print(map(reprlib.repr, l3)) l3 = deepcopy(l) - import repr - print(map(repr.repr, l)) - print(map(repr.repr, l1)) - print(map(repr.repr, l2)) - print(map(repr.repr, l3)) + print(map(reprlib.repr, l)) + print(map(reprlib.repr, l1)) + print(map(reprlib.repr, l2)) + print(map(reprlib.repr, l3)) if __name__ == '__main__': _test() diff --git a/Lib/idlelib/Debugger.py b/Lib/idlelib/Debugger.py index 346763f46f..00aa4bba45 100644 --- a/Lib/idlelib/Debugger.py +++ b/Lib/idlelib/Debugger.py @@ -412,8 +412,8 @@ class NamespaceViewer: height = 20*len(dict) # XXX 20 == observed height of Entry widget self.master = master self.title = title - import repr - self.repr = repr.Repr() + import reprlib + self.repr = reprlib.Repr() self.repr.maxstring = 60 self.repr.maxother = 60 self.frame = frame = Frame(master) diff --git a/Lib/idlelib/ObjectBrowser.py b/Lib/idlelib/ObjectBrowser.py index 75bc3a6dc1..4cb432f418 100644 --- a/Lib/idlelib/ObjectBrowser.py +++ b/Lib/idlelib/ObjectBrowser.py @@ -11,7 +11,7 @@ from idlelib.TreeWidget import TreeItem, TreeNode, ScrolledCanvas -from repr import Repr +from reprlib import Repr myrepr = Repr() myrepr.maxstring = 100 diff --git a/Lib/pdb.py b/Lib/pdb.py index 7e1edb5f0b..bc0ec68b44 100755 --- a/Lib/pdb.py +++ b/Lib/pdb.py @@ -8,7 +8,7 @@ import sys import linecache import cmd import bdb -from repr import Repr +from reprlib import Repr import os import re import pprint diff --git a/Lib/pydoc.py b/Lib/pydoc.py index c60a198920..f94da3f96d 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -53,7 +53,7 @@ Richard Chamberlain, for the first implementation of textdoc. # path will be displayed. import sys, imp, os, re, inspect, builtins, pkgutil -from repr import Repr +from reprlib import Repr try: from collections import deque except ImportError: diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py index dbc55cdf3f..9d0487d8f5 100644 --- a/Lib/test/test___all__.py +++ b/Lib/test/test___all__.py @@ -114,7 +114,7 @@ class AllTest(unittest.TestCase): self.check_all("quopri") self.check_all("random") self.check_all("re") - self.check_all("repr") + self.check_all("reprlib") self.check_all("rfc822") self.check_all("rlcompleter") self.check_all("robotparser") diff --git a/Lib/test/test_repr.py b/Lib/test/test_repr.py index ac1a0a0f39..442c0482c7 100644 --- a/Lib/test/test_repr.py +++ b/Lib/test/test_repr.py @@ -9,8 +9,8 @@ import shutil import unittest from test.test_support import run_unittest -from repr import repr as r # Don't shadow builtin repr -from repr import Repr +from reprlib import repr as r # Don't shadow builtin repr +from reprlib import Repr def nestedTuple(nesting): @@ -42,6 +42,8 @@ Extension Modules Library ------- +- The repr module has been renamed to reprlib. + - The statvfs module has been removed. - #1713041: fix pprint's handling of maximum depth. |