diff options
| author | Benjamin Peterson <benjamin@python.org> | 2012-09-25 15:53:30 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2012-09-25 15:53:30 (GMT) |
| commit | 3331a20464d7018e8e0b0f7710690dd1575be3b6 (patch) | |
| tree | 79f345d27b7ed52abd0c7beaf8494b2594bdb5f8 /Lib/lib2to3 | |
| parent | 8b7ebafe6597b130463a684795109a6ef38e3eb6 (diff) | |
| parent | 1654d74e9a6250491bfb923424c4cf83af2af7a6 (diff) | |
| download | cpython-3331a20464d7018e8e0b0f7710690dd1575be3b6.zip cpython-3331a20464d7018e8e0b0f7710690dd1575be3b6.tar.gz cpython-3331a20464d7018e8e0b0f7710690dd1575be3b6.tar.bz2 | |
merge 3.2
Diffstat (limited to 'Lib/lib2to3')
| -rw-r--r-- | Lib/lib2to3/fixer_util.py | 4 | ||||
| -rw-r--r-- | Lib/lib2to3/refactor.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/lib2to3/fixer_util.py b/Lib/lib2to3/fixer_util.py index 92f0da9..2b5bb1d 100644 --- a/Lib/lib2to3/fixer_util.py +++ b/Lib/lib2to3/fixer_util.py @@ -274,9 +274,9 @@ def find_root(node): """Find the top level namespace.""" # Scamper up to the top level namespace while node.type != syms.file_input: - assert node.parent, "Tree is insane! root found before "\ - "file_input node was found." node = node.parent + if not node: + raise ValueError("root found before file_input node was found.") return node def does_tree_import(package, name, node): diff --git a/Lib/lib2to3/refactor.py b/Lib/lib2to3/refactor.py index 1e85810..201e193 100644 --- a/Lib/lib2to3/refactor.py +++ b/Lib/lib2to3/refactor.py @@ -445,7 +445,7 @@ class RefactoringTool(object): try: find_root(node) - except AssertionError: + except ValueError: # this node has been cut off from a # previous transformation ; skip continue |