[Python-checkins] r63525 - in sandbox/trunk/2to3/lib2to3: fixes/fix_imports.py tests/test_fixers.py

[alexandre.vassalotti]

Author: alexandre.vassalotti
Date: Wed May 21 23:43:29 2008
New Revision: 63525

Log:
Add missing comma in fix_imports.

Bug caught by Quentin Gallet-Gilles.


Modified:
   sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py
   sandbox/trunk/2to3/lib2to3/tests/test_fixers.py

Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py	(original)
+++ sandbox/trunk/2to3/lib2to3/fixes/fix_imports.py	Wed May 21 23:43:29 2008
@@ -28,7 +28,7 @@
            'Queue': ('queue', ['Empty', 'Full', 'Queue',
                                'PriorityQueue', 'LifoQueue']),
            'SocketServer': ('socketserver',
-                            ['TCPServer', 'UDPServer', 'BaseServer'
+                            ['TCPServer', 'UDPServer', 'BaseServer',
                              'ForkingUDPServer', 'ForkingTCPServer',
                              'ThreadingUDPServer', 'ThreadingTCPServer',
                              'BaseRequestHandler', 'StreamRequestHandler',

Modified: sandbox/trunk/2to3/lib2to3/tests/test_fixers.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/tests/test_fixers.py	(original)
+++ sandbox/trunk/2to3/lib2to3/tests/test_fixers.py	Wed May 21 23:43:29 2008
@@ -1415,8 +1415,8 @@
                                                  "NoOptionError",
                                                  "NoSectionError"]),
                "SocketServer": ("socketserver", ["TCPServer",
-                                                 "ForkingMixIn"
-                    #XXX: This is failing. Why?? "BaseServer"
+                                                 "ForkingMixIn",
+                                                 "BaseServer"
                                                  ]),
                "repr": ("reprlib", ["Repr", "repr"]),
               }