Revert the renaming of repr to reprlib.

diff --git a/Demo/pdist/cmptree.py b/Demo/pdist/cmptree.py
index dccd3aea8e53af15a0b47085eda97e3c91fbed9b..f6c611f696936152800317f4cbacadae28450ff4 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 reprlib import repr
+from repr import repr
 import FSProxy
 import time
 import os

diff --git a/Demo/pdist/server.py b/Demo/pdist/server.py
index ea70e7149daae7936fde59284ead049583fafa06..e692eea7ffc63f1b659ee5cebd600c620ee21994 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 reprlib import repr
+from repr import repr
 
 
 # Default verbosity (0 = silent, 1 = print connections, 2 = print requests too)

diff --git a/Doc/library/datatypes.rst b/Doc/library/datatypes.rst
index b6b37ab0d33b8fe23cb6fee16711156788c99545..4ebaa6cc55d5f40d0c18babf92ad5729d3137493 100644 (file)
--- a/Doc/library/datatypes.rst
+++ b/Doc/library/datatypes.rst
@@ -36,4 +36,4 @@ The following modules are documented in this chapter:
    new.rst
    copy.rst
    pprint.rst
-   reprlib.rst
+   repr.rst

diff --git a/Doc/library/reprlib.rst b/Doc/library/repr.rst
similarity index 92%
rename from Doc/library/reprlib.rst
rename to Doc/library/repr.rst
index c4859be84d9f228df2fdb9afa19abc59a6c9e983..bd9743db2e26959a68b10131c360a06d5d895058 100644 (file)
--- a/Doc/library/reprlib.rst
+++ b/Doc/library/repr.rst
@@ -1,20 +1,16 @@
-:mod:`reprlib` --- Alternate :func:`repr` implementation
-========================================================
 
-.. module:: repr
-   :synopsis: Old name for the reprlib module.
+:mod:`repr` --- Alternate :func:`repr` implementation
+=====================================================
 
-.. module:: reprlib
+.. module:: repr
    :synopsis: Alternate repr() implementation with size limits.
 .. sectionauthor:: Fred L. Drake, Jr. <fdrake@acm.org>
 
 .. note::
    The :mod:`repr` module has been renamed to :mod:`reprlib` in
-   Python 3.0.  It is importable under both names in Python 2.6
-   and the rest of the 2.x series.
-
+   Python 3.0.
 
-The :mod:`reprlib` module provides a means for producing object representations
+The :mod:`repr` 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 79044f945d9ae5812a0b1a447c370e73c0813a50..9da521355b0e7ffa09514c48903c1f9766daf92a 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:`reprlib` module provides a version of :func:`repr` customized for
+The :mod:`repr` module provides a version of :func:`repr` customized for
 abbreviated displays of large or deeply nested containers::
 
-   >>> import reprlib
-   >>> reprlib.repr(set('supercalifragilisticexpialidocious'))
+   >>> import repr   
+   >>> repr.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 5e4d7b49ee4616a4579c8aa1a520bc7aaf61c5f5..74870e3f5157f630d2ab3a1800203e02e0e8110e 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, 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 @@ class Bdb:
         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 f3871e5cb92713796438aaa3188af92c39241830..3f2033f5ffd104cf3bcff9db46179923b5c862da 100644 (file)
--- a/Lib/copy.py
+++ b/Lib/copy.py
@@ -399,16 +399,17 @@ def _test():
     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 a56c224e65a776e368f1e02abed6141365f6366b..f56460aad0964b24936a60e7ebaeaeb6cab4fb65 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 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 8ff0041766e4747bf668a5c3bf4285bf47b72eeb..a2a6cee4981f94b8ad991a9639534468e986e18f 100644 (file)
--- 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 3ed7a2f140c3146e59cd79cdff19b82f1b2832d9..86162025f847eb39abb62fe599cb4feab6160c22 100755 (executable)
--- a/Lib/pdb.py
+++ b/Lib/pdb.py
@@ -8,7 +8,7 @@ import sys
 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 987d2137d7fa9b9d90c695b77b553f50472f7c0d..8007ed001a1f0b932133b3a2ef31892cb62a1170 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 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 466d921c928a2209ab1638a231042781c4ce12b9..846a2f60d2ebeba27c58517d60673d65746ef356 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("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 ece38ec46ccff1ca5fac432881ad0ebd941f91e1..b12d14d64511fabfa30dd9096b0a201ca6e1c68d 100644 (file)
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -218,7 +218,7 @@ class TestStdlibRenames(unittest.TestCase):
     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 99%
rename from Lib/test/test_reprlib.py
rename to Lib/test/test_repr.py
index 50f728c24c51174ca10d01856ed4a11b59706664..1094816ae609fc9f1a489f356d9ceeec770ebe60 100644 (file)
--- a/Lib/test/test_reprlib.py
+++ b/Lib/test/test_repr.py
@@ -9,8 +9,8 @@ import shutil
 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):

diff --git a/Misc/NEWS b/Misc/NEWS
index 9479125f706f3e257941dfd940862ae1f330552b..ec232a6b2350e8a70ea0d3b7c42b7ab3cfb34a4c 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -76,9 +76,6 @@ Library
   ctypes.util.find_library(name) now call this function when name is
   'm' or 'c'.
 
-- The repr module has been renamed 'reprlib'.  The old name is now
-  deprecated.
-
 - The statvfs module has been deprecated for removal in Python 3.0.
 
 - The sunaudiodev and SUNAUDIODEV modules have been deprecated for