diff options
Diffstat (limited to 'Lib')
| -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 |
8 files changed, 20 insertions, 21 deletions
diff --git a/Lib/bdb.py b/Lib/bdb.py index b8a20ece552..747e0929f0e 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 899ee4d0ada..a334b7961bb 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 346763f46f3..00aa4bba45b 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 75bc3a6dc18..4cb432f4188 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 7e1edb5f0b5..bc0ec68b44b 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 c60a1989208..f94da3f96da 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 dbc55cdf3f9..9d0487d8f55 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 ac1a0a0f393..442c0482c76 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): |