Merged revisions 73370 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
................
r73370 | benjamin.peterson | 2009-06-11 17:06:46 -0500 (Thu, 11 Jun 2009) | 105 lines
Merged revisions 72523,72950-72951,72994,73003,73033,73036-73040,73091-73093,73096,73179-73181,73192,73231,73244,73255-73256,73365 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3
........
r72523 | benjamin.peterson | 2009-05-09 14:42:26 -0500 (Sat, 09 May 2009) | 1 line
remove parenthesis
........
r72950 | benjamin.peterson | 2009-05-26 18:19:45 -0500 (Tue, 26 May 2009) | 1 line
remove unused imports
........
r72951 | benjamin.peterson | 2009-05-26 18:27:00 -0500 (Tue, 26 May 2009) | 1 line
this is no longer executable
........
r72994 | benjamin.peterson | 2009-05-28 15:32:54 -0500 (Thu, 28 May 2009) | 1 line
fix test_all_fixers on Windows #6134
........
r73003 | benjamin.peterson | 2009-05-28 21:57:28 -0500 (Thu, 28 May 2009) | 4 lines
make 2to3 test utilities easier to use with other applications (3to2)
Patch by Joe Amenta
........
r73033 | benjamin.peterson | 2009-05-29 16:58:32 -0500 (Fri, 29 May 2009) | 1 line
update grammar for multi with statement
........
r73036 | benjamin.peterson | 2009-05-29 17:33:20 -0500 (Fri, 29 May 2009) | 1 line
simplify fix_unicode
........
r73037 | benjamin.peterson | 2009-05-29 17:53:03 -0500 (Fri, 29 May 2009) | 1 line
add custom error for pattern syntax errors
........
r73038 | benjamin.peterson | 2009-05-29 17:55:00 -0500 (Fri, 29 May 2009) | 1 line
complain if details are attached to a token
........
r73039 | benjamin.peterson | 2009-05-29 18:00:28 -0500 (Fri, 29 May 2009) | 1 line
add a test for whitespace
........
r73040 | benjamin.peterson | 2009-05-29 18:01:17 -0500 (Fri, 29 May 2009) | 1 line
a fix for emacs highlighting
........
r73091 | benjamin.peterson | 2009-05-31 20:55:25 -0500 (Sun, 31 May 2009) | 1 line
deprecate set_prefix() and get_prefix() in favor of a prefix property
........
r73092 | benjamin.peterson | 2009-05-31 21:00:51 -0500 (Sun, 31 May 2009) | 1 line
change hideous java naming scheme
........
r73093 | benjamin.peterson | 2009-05-31 21:01:39 -0500 (Sun, 31 May 2009) | 1 line
remove dated comment
........
r73096 | benjamin.peterson | 2009-05-31 21:40:53 -0500 (Sun, 31 May 2009) | 1 line
group tests
........
r73179 | benjamin.peterson | 2009-06-03 13:09:53 -0500 (Wed, 03 Jun 2009) | 1 line
handle the case where there's multiple trailers #6185
........
r73180 | benjamin.peterson | 2009-06-03 13:18:05 -0500 (Wed, 03 Jun 2009) | 1 line
scrap __main__ section
........
r73181 | benjamin.peterson | 2009-06-03 13:24:48 -0500 (Wed, 03 Jun 2009) | 1 line
remove shebang lines and __main__ sections
........
r73192 | benjamin.peterson | 2009-06-03 19:16:30 -0500 (Wed, 03 Jun 2009) | 4 lines
actually test something here
Thanks to Joe Amenta for noticing.y
........
r73231 | benjamin.peterson | 2009-06-04 13:38:50 -0500 (Thu, 04 Jun 2009) | 1 line
remove unused variable
........
r73244 | benjamin.peterson | 2009-06-05 08:39:25 -0500 (Fri, 05 Jun 2009) | 1 line
allow fixers to give different options in setUp
........
r73255 | benjamin.peterson | 2009-06-06 11:23:46 -0500 (Sat, 06 Jun 2009) | 1 line
fix the except fixer on one line suites #6222
........
r73256 | benjamin.peterson | 2009-06-06 11:27:40 -0500 (Sat, 06 Jun 2009) | 1 line
test one-line else and finally clauses
........
r73365 | benjamin.peterson | 2009-06-11 17:01:32 -0500 (Thu, 11 Jun 2009) | 1 line
normalize whitespace
........
................
2009-06-11 20:47:38 -03:00
|
|
|
#!/usr/bin/env python
|
2008-03-19 02:04:44 -03:00
|
|
|
# Copyright 2006 Google, Inc. All Rights Reserved.
|
|
|
|
# Licensed to PSF under a Contributor Agreement.
|
|
|
|
|
|
|
|
"""Main program for testing the infrastructure."""
|
|
|
|
|
|
|
|
__author__ = "Guido van Rossum <guido@python.org>"
|
|
|
|
|
|
|
|
# Support imports (need to be imported first)
|
2008-03-23 21:50:58 -03:00
|
|
|
from . import support
|
2008-03-19 02:04:44 -03:00
|
|
|
|
|
|
|
# Python imports
|
|
|
|
import os
|
|
|
|
import sys
|
|
|
|
import logging
|
|
|
|
|
|
|
|
# Local imports
|
|
|
|
from .. import pytree
|
|
|
|
import pgen2
|
|
|
|
from pgen2 import driver
|
|
|
|
|
|
|
|
logging.basicConfig()
|
|
|
|
|
|
|
|
def main():
|
|
|
|
gr = driver.load_grammar("Grammar.txt")
|
|
|
|
dr = driver.Driver(gr, convert=pytree.convert)
|
|
|
|
|
|
|
|
fn = "example.py"
|
|
|
|
tree = dr.parse_file(fn, debug=True)
|
|
|
|
if not diff(fn, tree):
|
2008-03-19 02:33:36 -03:00
|
|
|
print("No diffs.")
|
2008-03-19 02:04:44 -03:00
|
|
|
if not sys.argv[1:]:
|
|
|
|
return # Pass a dummy argument to run the complete test suite below
|
|
|
|
|
|
|
|
problems = []
|
|
|
|
|
|
|
|
# Process every imported module
|
|
|
|
for name in sys.modules:
|
|
|
|
mod = sys.modules[name]
|
|
|
|
if mod is None or not hasattr(mod, "__file__"):
|
|
|
|
continue
|
|
|
|
fn = mod.__file__
|
|
|
|
if fn.endswith(".pyc"):
|
|
|
|
fn = fn[:-1]
|
|
|
|
if not fn.endswith(".py"):
|
|
|
|
continue
|
2008-03-19 02:33:36 -03:00
|
|
|
print("Parsing", fn, file=sys.stderr)
|
2008-03-19 02:04:44 -03:00
|
|
|
tree = dr.parse_file(fn, debug=True)
|
|
|
|
if diff(fn, tree):
|
|
|
|
problems.append(fn)
|
|
|
|
|
|
|
|
# Process every single module on sys.path (but not in packages)
|
|
|
|
for dir in sys.path:
|
|
|
|
try:
|
|
|
|
names = os.listdir(dir)
|
|
|
|
except os.error:
|
|
|
|
continue
|
2008-03-19 02:33:36 -03:00
|
|
|
print("Scanning", dir, "...", file=sys.stderr)
|
2008-03-19 02:04:44 -03:00
|
|
|
for name in names:
|
|
|
|
if not name.endswith(".py"):
|
|
|
|
continue
|
2008-03-19 02:33:36 -03:00
|
|
|
print("Parsing", name, file=sys.stderr)
|
2008-03-19 02:04:44 -03:00
|
|
|
fn = os.path.join(dir, name)
|
|
|
|
try:
|
|
|
|
tree = dr.parse_file(fn, debug=True)
|
2008-03-19 02:33:36 -03:00
|
|
|
except pgen2.parse.ParseError as err:
|
|
|
|
print("ParseError:", err)
|
2008-03-19 02:04:44 -03:00
|
|
|
else:
|
|
|
|
if diff(fn, tree):
|
|
|
|
problems.append(fn)
|
|
|
|
|
|
|
|
# Show summary of problem files
|
|
|
|
if not problems:
|
2008-03-19 02:33:36 -03:00
|
|
|
print("No problems. Congratulations!")
|
2008-03-19 02:04:44 -03:00
|
|
|
else:
|
2008-03-19 02:33:36 -03:00
|
|
|
print("Problems in following files:")
|
2008-03-19 02:04:44 -03:00
|
|
|
for fn in problems:
|
2008-03-19 02:33:36 -03:00
|
|
|
print("***", fn)
|
2008-03-19 02:04:44 -03:00
|
|
|
|
|
|
|
def diff(fn, tree):
|
|
|
|
f = open("@", "w")
|
|
|
|
try:
|
|
|
|
f.write(str(tree))
|
|
|
|
finally:
|
|
|
|
f.close()
|
|
|
|
try:
|
|
|
|
return os.system("diff -u %s @" % fn)
|
|
|
|
finally:
|
|
|
|
os.remove("@")
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
main()
|