Changed references to the reprlib module to use its new name.

diff --git a/Demo/pdist/cmptree.py b/Demo/pdist/cmptree.py
index f6c611f696936152800317f4cbacadae28450ff4..dccd3aea8e53af15a0b47085eda97e3c91fbed9b 100755 (executable)
--- 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 e692eea7ffc63f1b659ee5cebd600c620ee21994..ea70e7149daae7936fde59284ead049583fafa06 100755 (executable)
--- 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
similarity index 96%
rename from Doc/library/repr.rst
rename to Doc/library/reprlib.rst
index 493e2b32f1f9255fc9a3a2191d6228579b7ab1e0..84fd6fb982915976cb0d10934221ce770545a3ac 100644 (file)
--- 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.
 

diff --git a/Doc/tutorial/stdlib2.rst b/Doc/tutorial/stdlib2.rst
index 9da521355b0e7ffa09514c48903c1f9766daf92a..79044f945d9ae5812a0b1a447c370e73c0813a50 100644 (file)
--- 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 74870e3f5157f630d2ab3a1800203e02e0e8110e..5e4d7b49ee4616a4579c8aa1a520bc7aaf61c5f5 100644 (file)
--- a/Lib/bdb.py
+++ b/Lib/bdb.py
@@ -325,7 +325,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)
@@ -338,13 +338,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 55ea660c2b747069e747bcf1cfded0c9ca4781af..26ab366ec65ae2501462e98bc7c9af881b6f17e2 100644 (file)
--- a/Lib/copy.py
+++ b/Lib/copy.py
@@ -399,17 +399,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 f56460aad0964b24936a60e7ebaeaeb6cab4fb65..a56c224e65a776e368f1e02abed6141365f6366b 100644 (file)
--- a/Lib/idlelib/Debugger.py
+++ b/Lib/idlelib/Debugger.py
@@ -413,8 +413,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 a2a6cee4981f94b8ad991a9639534468e986e18f..8ff0041766e4747bf668a5c3bf4285bf47b72eeb 100644 (file)
--- a/Lib/idlelib/ObjectBrowser.py
+++ b/Lib/idlelib/ObjectBrowser.py
@@ -11,7 +11,7 @@
 
 from 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 86162025f847eb39abb62fe599cb4feab6160c22..3ed7a2f140c3146e59cd79cdff19b82f1b2832d9 100755 (executable)
--- 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 8007ed001a1f0b932133b3a2ef31892cb62a1170..987d2137d7fa9b9d90c695b77b553f50472f7c0d 100755 (executable)
--- 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, types, inspect, __builtin__, pkgutil
-from repr import Repr
+from reprlib import Repr
 from string import expandtabs, find, join, lower, split, strip, rfind, rstrip
 try:
     from collections import deque

diff --git a/Lib/test/test___all__.py b/Lib/test/test___all__.py
index 63df10a6615ac28c2a7b35c8ce8d40b3a9d8769f..eaa9c25049ca25cbb19e79ae5d1ade2c522ded3a 100644 (file)
--- a/Lib/test/test___all__.py
+++ b/Lib/test/test___all__.py
@@ -123,7 +123,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("rexec")
         self.check_all("rfc822")
         self.check_all("rlcompleter")

diff --git a/Lib/test/test_repr.py b/Lib/test/test_repr.py
index 1094816ae609fc9f1a489f356d9ceeec770ebe60..50f728c24c51174ca10d01856ed4a11b59706664 100644 (file)
--- 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):