[Python-checkins] cpython (merge 3.3 -> default): #19943: merge with 3.3.

[ezio.melotti]

http://hg.python.org/cpython/rev/a3bdbe220f8a
changeset:   87885:a3bdbe220f8a
parent:      87882:a0c687dc0039
parent:      87884:9f38bbd4e041
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue Dec 10 14:06:18 2013 +0200
summary:
  #19943: merge with 3.3.

files:
  Lib/lib2to3/fixes/fix_import.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/lib2to3/fixes/fix_import.py b/Lib/lib2to3/fixes/fix_import.py
--- a/Lib/lib2to3/fixes/fix_import.py
+++ b/Lib/lib2to3/fixes/fix_import.py
@@ -32,7 +32,7 @@
         elif node.type == syms.dotted_as_names:
             pending.extend(node.children[::-2])
         else:
-            raise AssertionError("unkown node type")
+            raise AssertionError("unknown node type")
 
 
 class FixImport(fixer_base.BaseFix):

-- 
Repository URL: http://hg.python.org/cpython