Revert the renaming of repr to reprlib.
diff --git a/Lib/bdb.py b/Lib/bdb.py
index 5e4d7b4..74870e3 100644
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -325,7 +325,7 @@
#
def format_stack_entry(self, frame_lineno, lprefix=': '):
- import linecache, reprlib
+ import linecache, repr
frame, lineno = frame_lineno
filename = self.canonic(frame.f_code.co_filename)
s = '%s(%r)' % (filename, lineno)
@@ -338,13 +338,13 @@
else:
args = None
if args:
- s = s + reprlib.repr(args)
+ s = s + repr.repr(args)
else:
s = s + '()'
if '__return__' in frame.f_locals:
rv = frame.f_locals['__return__']
s = s + '->'
- s = s + reprlib.repr(rv)
+ s = s + repr.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 f3871e5..3f2033f 100644
--- a/Lib/copy.py
+++ b/Lib/copy.py
@@ -399,16 +399,17 @@
print l2
l.append({l[1]: l, 'xyz': l[2]})
l3 = copy(l)
- import reprlib
- print map(reprlib.repr, l)
- print map(reprlib.repr, l1)
- print map(reprlib.repr, l2)
- print map(reprlib.repr, l3)
+ import repr
+ print map(repr.repr, l)
+ print map(repr.repr, l1)
+ print map(repr.repr, l2)
+ print map(repr.repr, l3)
l3 = deepcopy(l)
- print map(reprlib.repr, l)
- print map(reprlib.repr, l1)
- print map(reprlib.repr, l2)
- print map(reprlib.repr, l3)
+ import repr
+ print map(repr.repr, l)
+ print map(repr.repr, l1)
+ print map(repr.repr, l2)
+ print map(repr.repr, l3)
if __name__ == '__main__':
_test()
diff --git a/Lib/idlelib/Debugger.py b/Lib/idlelib/Debugger.py
index a56c224..f56460a 100644
--- a/Lib/idlelib/Debugger.py
+++ b/Lib/idlelib/Debugger.py
@@ -413,8 +413,8 @@
height = 20*len(dict) # XXX 20 == observed height of Entry widget
self.master = master
self.title = title
- import reprlib
- self.repr = reprlib.Repr()
+ import repr
+ self.repr = repr.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 8ff0041..a2a6cee 100644
--- a/Lib/idlelib/ObjectBrowser.py
+++ b/Lib/idlelib/ObjectBrowser.py
@@ -11,7 +11,7 @@
from TreeWidget import TreeItem, TreeNode, ScrolledCanvas
-from reprlib import Repr
+from repr import Repr
myrepr = Repr()
myrepr.maxstring = 100
diff --git a/Lib/pdb.py b/Lib/pdb.py
index 3ed7a2f..8616202 100755
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -8,7 +8,7 @@
import linecache
import cmd
import bdb
-from reprlib import Repr
+from repr import Repr
import os
import re
import pprint
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index 987d213..8007ed0 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -53,7 +53,7 @@
# path will be displayed.
import sys, imp, os, re, types, inspect, __builtin__, pkgutil
-from reprlib import Repr
+from repr import Repr
from string import expandtabs, find, join, lower, split, strip, rfind, rstrip
try:
from collections import deque
diff --git a/Lib/reprlib.py b/Lib/repr.py
similarity index 100%
rename from Lib/reprlib.py
rename to Lib/repr.py
diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 466d921..846a2f6 100644
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -123,7 +123,7 @@
self.check_all("quopri")
self.check_all("random")
self.check_all("re")
- self.check_all("reprlib")
+ self.check_all("repr")
self.check_all("rexec")
self.check_all("rfc822")
self.check_all("rlcompleter")
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index ece38ec..b12d14d 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -218,7 +218,7 @@
renames = {'Queue': 'queue',
'SocketServer': 'socketserver',
'ConfigParser': 'configparser',
- 'repr': 'reprlib'}
+ }
def check_rename(self, module_name, new_module_name):
"""Make sure that:
diff --git a/Lib/test/test_reprlib.py b/Lib/test/test_repr.py
similarity index 98%
rename from Lib/test/test_reprlib.py
rename to Lib/test/test_repr.py
index 50f728c..1094816 100644
--- a/Lib/test/test_reprlib.py
+++ b/Lib/test/test_repr.py
@@ -9,8 +9,8 @@
import unittest
from test.test_support import run_unittest
-from reprlib import repr as r # Don't shadow builtin repr
-from reprlib import Repr
+from repr import repr as r # Don't shadow builtin repr
+from repr import Repr
def nestedTuple(nesting):