[Python-checkins] r57897 - in sandbox/trunk/2to3: pgen2/tokenize.py tests/test_all_fixers.py tests/test_fixers.py tests/test_parser.py tests/test_pytree.py tests/test_util.py
collin.winter
python-checkins at python.org
Sat Sep 1 23:22:56 CEST 2007
Author: collin.winter
Date: Sat Sep 1 23:22:41 2007
New Revision: 57897
Modified:
sandbox/trunk/2to3/pgen2/tokenize.py
sandbox/trunk/2to3/tests/test_all_fixers.py
sandbox/trunk/2to3/tests/test_fixers.py
sandbox/trunk/2to3/tests/test_parser.py
sandbox/trunk/2to3/tests/test_pytree.py
sandbox/trunk/2to3/tests/test_util.py
Log:
Misc tweaks to allow 2to3 to run under Python 3.
Modified: sandbox/trunk/2to3/pgen2/tokenize.py
==============================================================================
--- sandbox/trunk/2to3/pgen2/tokenize.py (original)
+++ sandbox/trunk/2to3/pgen2/tokenize.py Sat Sep 1 23:22:41 2007
@@ -35,7 +35,7 @@
from pgen2 import token
__all__ = [x for x in dir(token) if x[0] != '_'] + ["tokenize",
"generate_tokens", "untokenize"]
-del x, token
+del token
def group(*choices): return '(' + '|'.join(choices) + ')'
def any(*choices): return group(*choices) + '*'
Modified: sandbox/trunk/2to3/tests/test_all_fixers.py
==============================================================================
--- sandbox/trunk/2to3/tests/test_all_fixers.py (original)
+++ sandbox/trunk/2to3/tests/test_all_fixers.py Sat Sep 1 23:22:41 2007
@@ -7,7 +7,7 @@
# Author: Collin Winter
# Testing imports
-import support
+from tests import support
# Python imports
from StringIO import StringIO
Modified: sandbox/trunk/2to3/tests/test_fixers.py
==============================================================================
--- sandbox/trunk/2to3/tests/test_fixers.py (original)
+++ sandbox/trunk/2to3/tests/test_fixers.py Sat Sep 1 23:22:41 2007
@@ -3,7 +3,7 @@
# Author: Collin Winter
# Testing imports
-import support
+from tests import support
# Python imports
from StringIO import StringIO
Modified: sandbox/trunk/2to3/tests/test_parser.py
==============================================================================
--- sandbox/trunk/2to3/tests/test_parser.py (original)
+++ sandbox/trunk/2to3/tests/test_parser.py Sat Sep 1 23:22:41 2007
@@ -9,8 +9,8 @@
# Author: Collin Winter
# Testing imports
-import support
-from support import driver, test_dir
+from tests import support
+from tests.support import driver, test_dir
# Python imports
import os
Modified: sandbox/trunk/2to3/tests/test_pytree.py
==============================================================================
--- sandbox/trunk/2to3/tests/test_pytree.py (original)
+++ sandbox/trunk/2to3/tests/test_pytree.py Sat Sep 1 23:22:41 2007
@@ -11,7 +11,7 @@
"""
# Testing imports
-import support
+from tests import support
# Local imports (XXX should become a package)
import pytree
Modified: sandbox/trunk/2to3/tests/test_util.py
==============================================================================
--- sandbox/trunk/2to3/tests/test_util.py (original)
+++ sandbox/trunk/2to3/tests/test_util.py Sat Sep 1 23:22:41 2007
@@ -3,7 +3,7 @@
# Author: Collin Winter
# Testing imports
-import support
+from tests import support
# Python imports
import os.path
More information about the Python-checkins
mailing list