Whitespace normalization.

diff --git a/Demo/parser/unparse.py b/Demo/parser/unparse.py
index 24558858f31aaadf60124db7e8ed92052cc09fd5..53b57b39f5a0b45ca4bb432fab8fa7aa6f243691 100644 (file)
--- a/Demo/parser/unparse.py
+++ b/Demo/parser/unparse.py
@@ -1,158 +1,158 @@
-"Usage: unparse.py <path to source file>"
-import sys
-
-class Unparser:
-    """Methods in this class recursively traverse an AST and
-    output source code for the abstract syntax; original formatting
-    is disregarged. """
-
-    def __init__(self, tree, file = sys.stdout):
-        """Unparser(tree, file=sys.stdout) -> None.
-         Print the source for tree to file."""
-        self.f = file
-        self._indent = 0
-        self.dispatch(tree)
-        self.f.flush()
-       
-    def fill(self, text = ""):
-        "Indent a piece of text, according to the current indentation level"
-        self.f.write("\n"+"    "*self._indent + text)
-        
-    def write(self, text):
-        "Append a piece of text to the current line."
-        self.f.write(text)
-        
-    def enter(self):
-        "Print ':', and increase the indentation."
-        self.write(":")
-        self._indent += 1
-    
-    def leave(self):
-        "Decrease the indentation level."
-        self._indent -= 1
-    
-    def dispatch(self, tree):
-        "Dispatcher function, dispatching tree type T to method _T."
-        if isinstance(tree, list):
-            for t in tree:
-                self.dispatch(t)
-            return
-        meth = getattr(self, "_"+tree.__class__.__name__)
-        meth(tree)
-
-
-    ############### Unparsing methods ######################
-    # There should be one method per concrete grammar type #
-    # Constructors should be grouped by sum type. Ideally, #
-    # this would follow the order in the grammar, but      #
-    # currently doesn't.                                   #
-    ########################################################
-
-    def _Module(self, tree):
-        for stmt in tree.body:
-            self.dispatch(stmt)
-    
-    # stmt
-    def _Expr(self, tree):
-        self.fill()
-        self.dispatch(tree.value)
-        
-    def _Import(self, t):
-        self.fill("import ")
-        first = True
-        for a in t.names:
-            if first:
-                first = False
-            else:
-                self.write(", ")
-            self.write(a.name)
-            if a.asname:
-                self.write(" as "+a.asname)
-                
-    def _Assign(self, t):
-        self.fill()
-        for target in t.targets:
-            self.dispatch(target)
-            self.write(" = ")
-        self.dispatch(t.value)
-        
-    def _ClassDef(self, t):
-        self.write("\n")
-        self.fill("class "+t.name)
-        if t.bases:
-            self.write("(")
-            for a in t.bases:
-                self.dispatch(a)
-                self.write(", ")
-            self.write(")")
-        self.enter()
-        self.dispatch(t.body)
-        self.leave()
-        
-    def _FunctionDef(self, t):
-        self.write("\n")
-        self.fill("def "+t.name + "(")
-        self.dispatch(t.args)
-        self.enter()
-        self.dispatch(t.body)
-        self.leave()
-        
-    def _If(self, t):
-        self.fill("if ")
-        self.dispatch(t.test)
-        self.enter()
-        # XXX elif?
-        self.dispatch(t.body)
-        self.leave()
-        if t.orelse:
-            self.fill("else")
-            self.enter()
-            self.dispatch(t.orelse)
-            self.leave()
-    
-    # expr 
-    def _Str(self, tree):
-        self.write(repr(tree.s))
-
-    def _Name(self, t):
-        self.write(t.id)
-        
-    def _List(self, t):
-        self.write("[")
-        for e in t.elts:
-            self.dispatch(e)
-            self.write(", ")
-        self.write("]")
-        
-    unop = {"Invert":"~", "Not": "not", "UAdd":"+", "USub":"-"}
-    def _UnaryOp(self, t):
-        self.write(self.unop[t.op.__class__.__name__])
-        self.write("(")
-        self.dispatch(t.operand)
-        self.write(")")
-        
-    # others
-    def _arguments(self, t):
-        first = True
-        # XXX t.defaults
-        for a in t.args:
-            if first:first = False
-            else: self.write(", ")
-            self.dispatch(a)
-        if t.vararg:
-            if first:first = False
-            else: self.write(", ")
-            self.write("*"+t.vararg)
-        if t.kwarg:
-            if first:first = False
-            else: self.write(", ")
-            self.write("**"+self.kwarg)
-        self.write(")")
-    
-def roundtrip(filename):
-    source = open(filename).read()
-    tree = compile(source, filename, "exec", 0x400)
-    Unparser(tree)
-    
-if __name__=='__main__':
-    roundtrip(sys.argv[1])
+"Usage: unparse.py <path to source file>"\r
+import sys\r
+\r
+class Unparser:\r
+    """Methods in this class recursively traverse an AST and\r
+    output source code for the abstract syntax; original formatting\r
+    is disregarged. """\r
+\r
+    def __init__(self, tree, file = sys.stdout):\r
+        """Unparser(tree, file=sys.stdout) -> None.\r
+         Print the source for tree to file."""\r
+        self.f = file\r
+        self._indent = 0\r
+        self.dispatch(tree)\r
+        self.f.flush()\r
+\r
+    def fill(self, text = ""):\r
+        "Indent a piece of text, according to the current indentation level"\r
+        self.f.write("\n"+"    "*self._indent + text)\r
+\r
+    def write(self, text):\r
+        "Append a piece of text to the current line."\r
+        self.f.write(text)\r
+\r
+    def enter(self):\r
+        "Print ':', and increase the indentation."\r
+        self.write(":")\r
+        self._indent += 1\r
+\r
+    def leave(self):\r
+        "Decrease the indentation level."\r
+        self._indent -= 1\r
+\r
+    def dispatch(self, tree):\r
+        "Dispatcher function, dispatching tree type T to method _T."\r
+        if isinstance(tree, list):\r
+            for t in tree:\r
+                self.dispatch(t)\r
+            return\r
+        meth = getattr(self, "_"+tree.__class__.__name__)\r
+        meth(tree)\r
+\r
+\r
+    ############### Unparsing methods ######################\r
+    # There should be one method per concrete grammar type #\r
+    # Constructors should be grouped by sum type. Ideally, #\r
+    # this would follow the order in the grammar, but      #\r
+    # currently doesn't.                                   #\r
+    ########################################################\r
+\r
+    def _Module(self, tree):\r
+        for stmt in tree.body:\r
+            self.dispatch(stmt)\r
+\r
+    # stmt\r
+    def _Expr(self, tree):\r
+        self.fill()\r
+        self.dispatch(tree.value)\r
+\r
+    def _Import(self, t):\r
+        self.fill("import ")\r
+        first = True\r
+        for a in t.names:\r
+            if first:\r
+                first = False\r
+            else:\r
+                self.write(", ")\r
+            self.write(a.name)\r
+            if a.asname:\r
+                self.write(" as "+a.asname)\r
+\r
+    def _Assign(self, t):\r
+        self.fill()\r
+        for target in t.targets:\r
+            self.dispatch(target)\r
+            self.write(" = ")\r
+        self.dispatch(t.value)\r
+\r
+    def _ClassDef(self, t):\r
+        self.write("\n")\r
+        self.fill("class "+t.name)\r
+        if t.bases:\r
+            self.write("(")\r
+            for a in t.bases:\r
+                self.dispatch(a)\r
+                self.write(", ")\r
+            self.write(")")\r
+        self.enter()\r
+        self.dispatch(t.body)\r
+        self.leave()\r
+\r
+    def _FunctionDef(self, t):\r
+        self.write("\n")\r
+        self.fill("def "+t.name + "(")\r
+        self.dispatch(t.args)\r
+        self.enter()\r
+        self.dispatch(t.body)\r
+        self.leave()\r
+\r
+    def _If(self, t):\r
+        self.fill("if ")\r
+        self.dispatch(t.test)\r
+        self.enter()\r
+        # XXX elif?\r
+        self.dispatch(t.body)\r
+        self.leave()\r
+        if t.orelse:\r
+            self.fill("else")\r
+            self.enter()\r
+            self.dispatch(t.orelse)\r
+            self.leave()\r
+\r
+    # expr\r
+    def _Str(self, tree):\r
+        self.write(repr(tree.s))\r
+\r
+    def _Name(self, t):\r
+        self.write(t.id)\r
+\r
+    def _List(self, t):\r
+        self.write("[")\r
+        for e in t.elts:\r
+            self.dispatch(e)\r
+            self.write(", ")\r
+        self.write("]")\r
+\r
+    unop = {"Invert":"~", "Not": "not", "UAdd":"+", "USub":"-"}\r
+    def _UnaryOp(self, t):\r
+        self.write(self.unop[t.op.__class__.__name__])\r
+        self.write("(")\r
+        self.dispatch(t.operand)\r
+        self.write(")")\r
+\r
+    # others\r
+    def _arguments(self, t):\r
+        first = True\r
+        # XXX t.defaults\r
+        for a in t.args:\r
+            if first:first = False\r
+            else: self.write(", ")\r
+            self.dispatch(a)\r
+        if t.vararg:\r
+            if first:first = False\r
+            else: self.write(", ")\r
+            self.write("*"+t.vararg)\r
+        if t.kwarg:\r
+            if first:first = False\r
+            else: self.write(", ")\r
+            self.write("**"+self.kwarg)\r
+        self.write(")")\r
+\r
+def roundtrip(filename):\r
+    source = open(filename).read()\r
+    tree = compile(source, filename, "exec", 0x400)\r
+    Unparser(tree)\r
+\r
+if __name__=='__main__':\r
+    roundtrip(sys.argv[1])\r

diff --git a/Lib/compiler/ast.py b/Lib/compiler/ast.py
index e270995fa81ad29ad2abe1a1c20f0ad22345011c..6e3e1825719d0404689ee77e40ed2f06b5529270 100644 (file)
--- a/Lib/compiler/ast.py
+++ b/Lib/compiler/ast.py
@@ -553,7 +553,7 @@ class Function(Node):
             self.varargs = 1
         if flags & CO_VARKEYWORDS:
             self.kwargs = 1
-    
+
 
 
     def getChildren(self):
@@ -584,7 +584,7 @@ class GenExpr(Node):
         self.lineno = lineno
         self.argnames = ['[outmost-iterable]']
         self.varargs = self.kwargs = None
-    
+
 
 
     def getChildren(self):
@@ -763,7 +763,7 @@ class Lambda(Node):
             self.varargs = 1
         if flags & CO_VARKEYWORDS:
             self.kwargs = 1
-    
+
 
 
     def getChildren(self):

diff --git a/Lib/test/contextmanager.py b/Lib/test/contextmanager.py
index 0ebf646f91951e05fa68d3e8c63fb3c9f8720aff..e8b08946196f19f34a66222420290749f9b906a9 100644 (file)
--- a/Lib/test/contextmanager.py
+++ b/Lib/test/contextmanager.py
@@ -1,34 +1,33 @@
-class GeneratorContextManager(object):
-    def __init__(self, gen):
-        self.gen = gen
-
-    def __context__(self):
-        return self
-
-    def __enter__(self):
-        try:
-            return self.gen.next()
-        except StopIteration:
-            raise RuntimeError("generator didn't yield")
-
-    def __exit__(self, type, value, traceback):
-        if type is None:
-            try:
-                self.gen.next()
-            except StopIteration:
-                return
-            else:
-                raise RuntimeError("generator didn't stop")
-        else:
-            try:
-                self.gen.throw(type, value, traceback)
-            except (type, StopIteration):
-                return
-            else:
-                raise RuntimeError("generator caught exception")
-
-def contextmanager(func):
-    def helper(*args, **kwds):
-        return GeneratorContextManager(func(*args, **kwds))
-    return helper
-
+class GeneratorContextManager(object):\r
+    def __init__(self, gen):\r
+        self.gen = gen\r
+\r
+    def __context__(self):\r
+        return self\r
+\r
+    def __enter__(self):\r
+        try:\r
+            return self.gen.next()\r
+        except StopIteration:\r
+            raise RuntimeError("generator didn't yield")\r
+\r
+    def __exit__(self, type, value, traceback):\r
+        if type is None:\r
+            try:\r
+                self.gen.next()\r
+            except StopIteration:\r
+                return\r
+            else:\r
+                raise RuntimeError("generator didn't stop")\r
+        else:\r
+            try:\r
+                self.gen.throw(type, value, traceback)\r
+            except (type, StopIteration):\r
+                return\r
+            else:\r
+                raise RuntimeError("generator caught exception")\r
+\r
+def contextmanager(func):\r
+    def helper(*args, **kwds):\r
+        return GeneratorContextManager(func(*args, **kwds))\r
+    return helper\r

diff --git a/Lib/test/nested.py b/Lib/test/nested.py
index bb210d462ac92a0cff9de1d2e9423c39c6ed6db0..a20cf43e7a63ffc65bf632dc01ddf619229d2ac5 100644 (file)
--- a/Lib/test/nested.py
+++ b/Lib/test/nested.py
@@ -1,41 +1,40 @@
-import sys
-from collections import deque
-
-
-class nested(object):
-    def __init__(self, *contexts):
-        self.contexts = contexts
-        self.entered = None
-
-    def __context__(self):
-        return self
-
-    def __enter__(self):
-        if self.entered is not None:
-            raise RuntimeError("Context is not reentrant")
-        self.entered = deque()
-        vars = []
-        try:
-            for context in self.contexts:
-                mgr = context.__context__()
-                vars.append(mgr.__enter__())
-                self.entered.appendleft(mgr)
-        except:
-            self.__exit__(*sys.exc_info())
-            raise
-        return vars
-
-    def __exit__(self, *exc_info):
-        # Behave like nested with statements
-        # first in, last out
-        # New exceptions override old ones
-        ex = exc_info
-        for mgr in self.entered:
-            try:
-                mgr.__exit__(*ex)
-            except:
-                ex = sys.exc_info()
-        self.entered = None
-        if ex is not exc_info:
-            raise ex[0], ex[1], ex[2]
-
+import sys\r
+from collections import deque\r
+\r
+\r
+class nested(object):\r
+    def __init__(self, *contexts):\r
+        self.contexts = contexts\r
+        self.entered = None\r
+\r
+    def __context__(self):\r
+        return self\r
+\r
+    def __enter__(self):\r
+        if self.entered is not None:\r
+            raise RuntimeError("Context is not reentrant")\r
+        self.entered = deque()\r
+        vars = []\r
+        try:\r
+            for context in self.contexts:\r
+                mgr = context.__context__()\r
+                vars.append(mgr.__enter__())\r
+                self.entered.appendleft(mgr)\r
+        except:\r
+            self.__exit__(*sys.exc_info())\r
+            raise\r
+        return vars\r
+\r
+    def __exit__(self, *exc_info):\r
+        # Behave like nested with statements\r
+        # first in, last out\r
+        # New exceptions override old ones\r
+        ex = exc_info\r
+        for mgr in self.entered:\r
+            try:\r
+                mgr.__exit__(*ex)\r
+            except:\r
+                ex = sys.exc_info()\r
+        self.entered = None\r
+        if ex is not exc_info:\r
+            raise ex[0], ex[1], ex[2]\r

diff --git a/Lib/test/test_ast.py b/Lib/test/test_ast.py
index 83a1baad8f98469211411e82bd469de33de1deb6..f83dc92de6bb32f897188fb36789e8e30d7af4c2 100644 (file)
--- a/Lib/test/test_ast.py
+++ b/Lib/test/test_ast.py
@@ -1,179 +1,178 @@
-import sys, itertools
-
-def to_tuple(t):
-    if t is None or isinstance(t, (basestring, int, long, complex)):
-        return t
-    elif isinstance(t, list):
-        return [to_tuple(e) for e in t]
-    result = [t.__class__.__name__]
-    if t._fields is None:
-        return tuple(result)
-    for f in t._fields:
-        result.append(to_tuple(getattr(t, f)))
-    return tuple(result)
-    
-# These tests are compiled through "exec"
-# There should be atleast one test per statement
-exec_tests = [
-    # FunctionDef
-    "def f(): pass",
-    # ClassDef
-    "class C:pass",
-    # Return
-    "def f():return 1",
-    # Delete
-    "del v",
-    # Assign
-    "v = 1",
-    # AugAssign
-    "v += 1",
-    # Print
-    "print >>f, 1, ",
-    # For
-    "for v in v:pass",
-    # While
-    "while v:pass",
-    # If
-    "if v:pass",
-    # Raise
-    "raise Exception, 'string'",
-    # TryExcept
-    "try:\n  pass\nexcept Exception:\n  pass",
-    # TryFinally
-    "try:\n  pass\nfinally:\n  pass",
-    # Assert
-    "assert v",
-    # Import
-    "import sys",
-    # ImportFrom
-    "from sys import v",
-    # Exec
-    "exec 'v'",
-    # Global
-    "global v",
-    # Expr
-    "1",
-    # Pass,
-    "pass",
-    # Break
-    "break",
-    # Continue
-    "continue",
-]
-
-# These are compiled through "single"
-# because of overlap with "eval", it just tests what
-# can't be tested with "eval"
-single_tests = [
-    "1+2"
-]
-
-# These are compiled through "eval"
-# It should test all expressions
-eval_tests = [
-  # BoolOp
-  "a and b",
-  # BinOp
-  "a + b",
-  # UnaryOp
-  "not v",
-  # Lambda
-  "lambda:None",
-  # Dict
-  "{ 1:2 }",
-  # ListComp
-  "[a for b in c if d]",
-  # GeneratorExp
-  "(a for b in c if d)",
-  # Yield - yield expressions can't work outside a function
-  #
-  # Compare
-  "1 < 2 < 3",
-  # Call
-  "f(1,2,c=3,*d,**e)",
-  # Repr
-  "`v`",
-  # Num
-  "10L",
-  # Str
-  "'string'",
-  # Attribute
-  "a.b",
-  # Subscript
-  "a[b:c]",
-  # Name
-  "v",
-  # List
-  "[1,2,3]",
-  # Tuple
-  "1,2,3"
-]
-
-# TODO: expr_context, slice, boolop, operator, unaryop, cmpop, comprehension
-# excepthandler, arguments, keywords, alias
-
-if __name__=='__main__' and sys.argv[1:] == ['-g']:
-    for statements, kind in ((exec_tests, "exec"), (single_tests, "single"), (eval_tests, "eval")):
-        print kind+"_results = ["
-        for s in statements:
-            print repr(to_tuple(compile(s, "?", kind, 0x400)))+","
-        print "]"
-    print "run_tests()"
-    raise SystemExit
-
-def run_tests():
-    for input, output, kind in ((exec_tests, exec_results, "exec"), 
-                                        (single_tests, single_results, "single"), 
-                                        (eval_tests, eval_results, "eval")):
-        for i, o in itertools.izip(input, output):
-            assert to_tuple(compile(i, "?", kind, 0x400)) == o
-
-#### EVERYTHING BELOW IS GENERATED ##### 
-exec_results = [
-('Module', [('FunctionDef', 'f', ('arguments', [], None, None, []), [('Pass',)], [])]),
-('Module', [('ClassDef', 'C', [], [('Pass',)])]),
-('Module', [('FunctionDef', 'f', ('arguments', [], None, None, []), [('Return', ('Num', 1))], [])]),
-('Module', [('Delete', [('Name', 'v', ('Del',))])]),
-('Module', [('Assign', [('Name', 'v', ('Store',))], ('Num', 1))]),
-('Module', [('AugAssign', ('Name', 'v', ('Load',)), ('Add',), ('Num', 1))]),
-('Module', [('Print', ('Name', 'f', ('Load',)), [('Num', 1)], False)]),
-('Module', [('For', ('Name', 'v', ('Store',)), ('Name', 'v', ('Load',)), [('Pass',)], [])]),
-('Module', [('While', ('Name', 'v', ('Load',)), [('Pass',)], [])]),
-('Module', [('If', ('Name', 'v', ('Load',)), [('Pass',)], [])]),
-('Module', [('Raise', ('Name', 'Exception', ('Load',)), ('Str', 'string'), None)]),
-('Module', [('TryExcept', [('Pass',)], [('excepthandler', ('Name', 'Exception', ('Load',)), None, [('Pass',)])], [])]),
-('Module', [('TryFinally', [('Pass',)], [('Pass',)])]),
-('Module', [('Assert', ('Name', 'v', ('Load',)), None)]),
-('Module', [('Import', [('alias', 'sys', None)])]),
-('Module', [('ImportFrom', 'sys', [('alias', 'v', None)], 0)]),
-('Module', [('Exec', ('Str', 'v'), None, None)]),
-('Module', [('Global', ['v'])]),
-('Module', [('Expr', ('Num', 1))]),
-('Module', [('Pass',)]),
-('Module', [('Break',)]),
-('Module', [('Continue',)]),
-]
-single_results = [
-('Interactive', [('Expr', ('BinOp', ('Num', 1), ('Add',), ('Num', 2)))]),
-]
-eval_results = [
-('Expression', ('BoolOp', ('And',), [('Name', 'a', ('Load',)), ('Name', 'b', ('Load',))])),
-('Expression', ('BinOp', ('Name', 'a', ('Load',)), ('Add',), ('Name', 'b', ('Load',)))),
-('Expression', ('UnaryOp', ('Not',), ('Name', 'v', ('Load',)))),
-('Expression', ('Lambda', ('arguments', [], None, None, []), ('Name', 'None', ('Load',)))),
-('Expression', ('Dict', [('Num', 1)], [('Num', 2)])),
-('Expression', ('ListComp', ('Name', 'a', ('Load',)), [('comprehension', ('Name', 'b', ('Store',)), ('Name', 'c', ('Load',)), [('Name', 'd', ('Load',))])])),
-('Expression', ('GeneratorExp', ('Name', 'a', ('Load',)), [('comprehension', ('Name', 'b', ('Store',)), ('Name', 'c', ('Load',)), [('Name', 'd', ('Load',))])])),
-('Expression', ('Compare', ('Num', 1), [('Lt',), ('Lt',)], [('Num', 2), ('Num', 3)])),
-('Expression', ('Call', ('Name', 'f', ('Load',)), [('Num', 1), ('Num', 2)], [('keyword', 'c', ('Num', 3))], ('Name', 'd', ('Load',)), ('Name', 'e', ('Load',)))),
-('Expression', ('Repr', ('Name', 'v', ('Load',)))),
-('Expression', ('Num', 10L)),
-('Expression', ('Str', 'string')),
-('Expression', ('Attribute', ('Name', 'a', ('Load',)), 'b', ('Load',))),
-('Expression', ('Subscript', ('Name', 'a', ('Load',)), ('Slice', ('Name', 'b', ('Load',)), ('Name', 'c', ('Load',)), None), ('Load',))),
-('Expression', ('Name', 'v', ('Load',))),
-('Expression', ('List', [('Num', 1), ('Num', 2), ('Num', 3)], ('Load',))),
-('Expression', ('Tuple', [('Num', 1), ('Num', 2), ('Num', 3)], ('Load',))),
-]
-run_tests()
-
+import sys, itertools\r
+\r
+def to_tuple(t):\r
+    if t is None or isinstance(t, (basestring, int, long, complex)):\r
+        return t\r
+    elif isinstance(t, list):\r
+        return [to_tuple(e) for e in t]\r
+    result = [t.__class__.__name__]\r
+    if t._fields is None:\r
+        return tuple(result)\r
+    for f in t._fields:\r
+        result.append(to_tuple(getattr(t, f)))\r
+    return tuple(result)\r
+\r
+# These tests are compiled through "exec"\r
+# There should be atleast one test per statement\r
+exec_tests = [\r
+    # FunctionDef\r
+    "def f(): pass",\r
+    # ClassDef\r
+    "class C:pass",\r
+    # Return\r
+    "def f():return 1",\r
+    # Delete\r
+    "del v",\r
+    # Assign\r
+    "v = 1",\r
+    # AugAssign\r
+    "v += 1",\r
+    # Print\r
+    "print >>f, 1, ",\r
+    # For\r
+    "for v in v:pass",\r
+    # While\r
+    "while v:pass",\r
+    # If\r
+    "if v:pass",\r
+    # Raise\r
+    "raise Exception, 'string'",\r
+    # TryExcept\r
+    "try:\n  pass\nexcept Exception:\n  pass",\r
+    # TryFinally\r
+    "try:\n  pass\nfinally:\n  pass",\r
+    # Assert\r
+    "assert v",\r
+    # Import\r
+    "import sys",\r
+    # ImportFrom\r
+    "from sys import v",\r
+    # Exec\r
+    "exec 'v'",\r
+    # Global\r
+    "global v",\r
+    # Expr\r
+    "1",\r
+    # Pass,\r
+    "pass",\r
+    # Break\r
+    "break",\r
+    # Continue\r
+    "continue",\r
+]\r
+\r
+# These are compiled through "single"\r
+# because of overlap with "eval", it just tests what\r
+# can't be tested with "eval"\r
+single_tests = [\r
+    "1+2"\r
+]\r
+\r
+# These are compiled through "eval"\r
+# It should test all expressions\r
+eval_tests = [\r
+  # BoolOp\r
+  "a and b",\r
+  # BinOp\r
+  "a + b",\r
+  # UnaryOp\r
+  "not v",\r
+  # Lambda\r
+  "lambda:None",\r
+  # Dict\r
+  "{ 1:2 }",\r
+  # ListComp\r
+  "[a for b in c if d]",\r
+  # GeneratorExp\r
+  "(a for b in c if d)",\r
+  # Yield - yield expressions can't work outside a function\r
+  #\r
+  # Compare\r
+  "1 < 2 < 3",\r
+  # Call\r
+  "f(1,2,c=3,*d,**e)",\r
+  # Repr\r
+  "`v`",\r
+  # Num\r
+  "10L",\r
+  # Str\r
+  "'string'",\r
+  # Attribute\r
+  "a.b",\r
+  # Subscript\r
+  "a[b:c]",\r
+  # Name\r
+  "v",\r
+  # List\r
+  "[1,2,3]",\r
+  # Tuple\r
+  "1,2,3"\r
+]\r
+\r
+# TODO: expr_context, slice, boolop, operator, unaryop, cmpop, comprehension\r
+# excepthandler, arguments, keywords, alias\r
+\r
+if __name__=='__main__' and sys.argv[1:] == ['-g']:\r
+    for statements, kind in ((exec_tests, "exec"), (single_tests, "single"), (eval_tests, "eval")):\r
+        print kind+"_results = ["\r
+        for s in statements:\r
+            print repr(to_tuple(compile(s, "?", kind, 0x400)))+","\r
+        print "]"\r
+    print "run_tests()"\r
+    raise SystemExit\r
+\r
+def run_tests():\r
+    for input, output, kind in ((exec_tests, exec_results, "exec"),\r
+                                        (single_tests, single_results, "single"),\r
+                                        (eval_tests, eval_results, "eval")):\r
+        for i, o in itertools.izip(input, output):\r
+            assert to_tuple(compile(i, "?", kind, 0x400)) == o\r
+\r
+#### EVERYTHING BELOW IS GENERATED #####\r
+exec_results = [\r
+('Module', [('FunctionDef', 'f', ('arguments', [], None, None, []), [('Pass',)], [])]),\r
+('Module', [('ClassDef', 'C', [], [('Pass',)])]),\r
+('Module', [('FunctionDef', 'f', ('arguments', [], None, None, []), [('Return', ('Num', 1))], [])]),\r
+('Module', [('Delete', [('Name', 'v', ('Del',))])]),\r
+('Module', [('Assign', [('Name', 'v', ('Store',))], ('Num', 1))]),\r
+('Module', [('AugAssign', ('Name', 'v', ('Load',)), ('Add',), ('Num', 1))]),\r
+('Module', [('Print', ('Name', 'f', ('Load',)), [('Num', 1)], False)]),\r
+('Module', [('For', ('Name', 'v', ('Store',)), ('Name', 'v', ('Load',)), [('Pass',)], [])]),\r
+('Module', [('While', ('Name', 'v', ('Load',)), [('Pass',)], [])]),\r
+('Module', [('If', ('Name', 'v', ('Load',)), [('Pass',)], [])]),\r
+('Module', [('Raise', ('Name', 'Exception', ('Load',)), ('Str', 'string'), None)]),\r
+('Module', [('TryExcept', [('Pass',)], [('excepthandler', ('Name', 'Exception', ('Load',)), None, [('Pass',)])], [])]),\r
+('Module', [('TryFinally', [('Pass',)], [('Pass',)])]),\r
+('Module', [('Assert', ('Name', 'v', ('Load',)), None)]),\r
+('Module', [('Import', [('alias', 'sys', None)])]),\r
+('Module', [('ImportFrom', 'sys', [('alias', 'v', None)], 0)]),\r
+('Module', [('Exec', ('Str', 'v'), None, None)]),\r
+('Module', [('Global', ['v'])]),\r
+('Module', [('Expr', ('Num', 1))]),\r
+('Module', [('Pass',)]),\r
+('Module', [('Break',)]),\r
+('Module', [('Continue',)]),\r
+]\r
+single_results = [\r
+('Interactive', [('Expr', ('BinOp', ('Num', 1), ('Add',), ('Num', 2)))]),\r
+]\r
+eval_results = [\r
+('Expression', ('BoolOp', ('And',), [('Name', 'a', ('Load',)), ('Name', 'b', ('Load',))])),\r
+('Expression', ('BinOp', ('Name', 'a', ('Load',)), ('Add',), ('Name', 'b', ('Load',)))),\r
+('Expression', ('UnaryOp', ('Not',), ('Name', 'v', ('Load',)))),\r
+('Expression', ('Lambda', ('arguments', [], None, None, []), ('Name', 'None', ('Load',)))),\r
+('Expression', ('Dict', [('Num', 1)], [('Num', 2)])),\r
+('Expression', ('ListComp', ('Name', 'a', ('Load',)), [('comprehension', ('Name', 'b', ('Store',)), ('Name', 'c', ('Load',)), [('Name', 'd', ('Load',))])])),\r
+('Expression', ('GeneratorExp', ('Name', 'a', ('Load',)), [('comprehension', ('Name', 'b', ('Store',)), ('Name', 'c', ('Load',)), [('Name', 'd', ('Load',))])])),\r
+('Expression', ('Compare', ('Num', 1), [('Lt',), ('Lt',)], [('Num', 2), ('Num', 3)])),\r
+('Expression', ('Call', ('Name', 'f', ('Load',)), [('Num', 1), ('Num', 2)], [('keyword', 'c', ('Num', 3))], ('Name', 'd', ('Load',)), ('Name', 'e', ('Load',)))),\r
+('Expression', ('Repr', ('Name', 'v', ('Load',)))),\r
+('Expression', ('Num', 10L)),\r
+('Expression', ('Str', 'string')),\r
+('Expression', ('Attribute', ('Name', 'a', ('Load',)), 'b', ('Load',))),\r
+('Expression', ('Subscript', ('Name', 'a', ('Load',)), ('Slice', ('Name', 'b', ('Load',)), ('Name', 'c', ('Load',)), None), ('Load',))),\r
+('Expression', ('Name', 'v', ('Load',))),\r
+('Expression', ('List', [('Num', 1), ('Num', 2), ('Num', 3)], ('Load',))),\r
+('Expression', ('Tuple', [('Num', 1), ('Num', 2), ('Num', 3)], ('Load',))),\r
+]\r
+run_tests()\r

diff --git a/Lib/test/test_importhooks.py b/Lib/test/test_importhooks.py
index c58075543b49ef9ea4f526e8c8dbb8067dfeb06d..5af7847aa45013289b4a286ab98ab3fe2d922c8f 100644 (file)
--- a/Lib/test/test_importhooks.py
+++ b/Lib/test/test_importhooks.py
@@ -190,7 +190,7 @@ class ImportHooksTestCase(ImportHooksBaseTestCase):
         TestImporter.modules['reloadmodule'] = (False, reload_co)
         reload(reloadmodule)
         self.failUnless(hasattr(reloadmodule,'reloaded'))
-        
+
         import hooktestpackage.oldabs
         self.assertEqual(hooktestpackage.oldabs.get_name(),
                          "hooktestpackage.oldabs")
@@ -208,7 +208,7 @@ class ImportHooksTestCase(ImportHooksBaseTestCase):
                          "hooktestpackage.futrel")
         self.assertEqual(hooktestpackage.futrel.sub,
                          hooktestpackage.sub)
-        
+
         import sub
         self.assertEqual(sub.get_name(), "sub")
 

diff --git a/Lib/test/test_with.py b/Lib/test/test_with.py
index 9d809efd73982bdd2d5106daf050074ed51e88d5..3f328305329212db42045b990e44dd872e533250 100644 (file)
--- a/Lib/test/test_with.py
+++ b/Lib/test/test_with.py
@@ -1,560 +1,560 @@
-#!/usr/bin/env python
-
-"""Unit tests for the with statement specified in PEP 343."""
-
-__author__ = "Mike Bland"
-__email__ = "mbland at acm dot org"
-
-import unittest
-from test.contextmanager import GeneratorContextManager
-from test.nested import nested
-from test.test_support import run_unittest
-
-
-class MockContextManager(GeneratorContextManager):
-    def __init__(self, gen):
-        GeneratorContextManager.__init__(self, gen)
-        self.context_called = False
-        self.enter_called = False
-        self.exit_called = False
-        self.exit_args = None
-
-    def __context__(self):
-        self.context_called = True
-        return GeneratorContextManager.__context__(self)
-
-    def __enter__(self):
-        self.enter_called = True
-        return GeneratorContextManager.__enter__(self)
-
-    def __exit__(self, type, value, traceback):
-        self.exit_called = True
-        self.exit_args = (type, value, traceback)
-        return GeneratorContextManager.__exit__(self, type, value, traceback)
-
-
-def mock_contextmanager(func):
-    def helper(*args, **kwds):
-        return MockContextManager(func(*args, **kwds))
-    return helper
-
-
-class MockResource(object):
-    def __init__(self):
-        self.yielded = False
-        self.stopped = False
-
-
-@mock_contextmanager
-def mock_contextmanager_generator():
-    mock = MockResource()
-    try:
-        mock.yielded = True
-        yield mock
-    finally:
-        mock.stopped = True
-
-
-class MockNested(nested):
-    def __init__(self, *contexts):
-        nested.__init__(self, *contexts)
-        self.context_called = False
-        self.enter_called = False
-        self.exit_called = False
-        self.exit_args = None
-
-    def __context__(self):
-        self.context_called = True
-        return nested.__context__(self)
-
-    def __enter__(self):
-        self.enter_called = True
-        return nested.__enter__(self)
-
-    def __exit__(self, *exc_info):
-        self.exit_called = True
-        self.exit_args = exc_info
-        return nested.__exit__(self, *exc_info)
-
- 
-class FailureTestCase(unittest.TestCase):
-    def testNameError(self):
-        def fooNotDeclared():
-            with foo: pass
-        self.assertRaises(NameError, fooNotDeclared)
-
-    def testContextAttributeError(self):
-        class LacksContext(object):
-            def __enter__(self):
-                pass
-
-            def __exit__(self, type, value, traceback):
-                pass
-
-        def fooLacksContext():
-            foo = LacksContext()
-            with foo: pass
-        self.assertRaises(AttributeError, fooLacksContext)
-
-    def testEnterAttributeError(self):
-        class LacksEnter(object):
-            def __context__(self):
-                pass
-
-            def __exit__(self, type, value, traceback):
-                pass
-
-        def fooLacksEnter():
-            foo = LacksEnter()
-            with foo: pass
-        self.assertRaises(AttributeError, fooLacksEnter)
-
-    def testExitAttributeError(self):
-        class LacksExit(object):
-            def __context__(self):
-                pass
-
-            def __enter__(self):
-                pass
-
-        def fooLacksExit():
-            foo = LacksExit()
-            with foo: pass
-        self.assertRaises(AttributeError, fooLacksExit)
-
-    def assertRaisesSyntaxError(self, codestr):
-        def shouldRaiseSyntaxError(s):
-            compile(s, '', 'single')
-        self.assertRaises(SyntaxError, shouldRaiseSyntaxError, codestr)
-
-    def testAssignmentToNoneError(self):
-        self.assertRaisesSyntaxError('with mock as None:\n  pass')
-        self.assertRaisesSyntaxError(
-            'with mock as (None):\n'
-            '  pass')
-
-    def testAssignmentToEmptyTupleError(self):
-        self.assertRaisesSyntaxError(
-            'with mock as ():\n'
-            '  pass')
-
-    def testAssignmentToTupleOnlyContainingNoneError(self):
-        self.assertRaisesSyntaxError('with mock as None,:\n  pass')
-        self.assertRaisesSyntaxError(
-            'with mock as (None,):\n'
-            '  pass')
-
-    def testAssignmentToTupleContainingNoneError(self):
-        self.assertRaisesSyntaxError(
-            'with mock as (foo, None, bar):\n'
-            '  pass')
-
-    def testContextThrows(self):
-        class ContextThrows(object):
-            def __context__(self):
-                raise RuntimeError("Context threw")
-
-        def shouldThrow():
-            ct = ContextThrows()
-            self.foo = None
-            with ct as self.foo:
-                pass
-        self.assertRaises(RuntimeError, shouldThrow)
-        self.assertEqual(self.foo, None)
-
-    def testEnterThrows(self):
-        class EnterThrows(object):
-            def __context__(self):
-                return self
-
-            def __enter__(self):
-                raise RuntimeError("Context threw")
-
-            def __exit__(self, *args):
-                pass
-
-        def shouldThrow():
-            ct = EnterThrows()
-            self.foo = None
-            with ct as self.foo:
-                pass
-        self.assertRaises(RuntimeError, shouldThrow)
-        self.assertEqual(self.foo, None)
-
-    def testExitThrows(self):
-        class ExitThrows(object):
-            def __context__(self):
-                return self
-            def __enter__(self):
-                return
-            def __exit__(self, *args):
-                raise RuntimeError(42)
-        def shouldThrow():
-            with ExitThrows():
-                pass
-        self.assertRaises(RuntimeError, shouldThrow)
-
-class ContextmanagerAssertionMixin(object):
-    TEST_EXCEPTION = RuntimeError("test exception")
-
-    def assertInWithManagerInvariants(self, mock_manager):
-        self.assertTrue(mock_manager.context_called)
-        self.assertTrue(mock_manager.enter_called)
-        self.assertFalse(mock_manager.exit_called)
-        self.assertEqual(mock_manager.exit_args, None)
-
-    def assertAfterWithManagerInvariants(self, mock_manager, exit_args):
-        self.assertTrue(mock_manager.context_called)
-        self.assertTrue(mock_manager.enter_called)
-        self.assertTrue(mock_manager.exit_called)
-        self.assertEqual(mock_manager.exit_args, exit_args)
-
-    def assertAfterWithManagerInvariantsNoError(self, mock_manager):
-        self.assertAfterWithManagerInvariants(mock_manager,
-            (None, None, None))
-
-    def assertInWithGeneratorInvariants(self, mock_generator):
-        self.assertTrue(mock_generator.yielded)
-        self.assertFalse(mock_generator.stopped)
-
-    def assertAfterWithGeneratorInvariantsNoError(self, mock_generator):
-        self.assertTrue(mock_generator.yielded)
-        self.assertTrue(mock_generator.stopped)
-
-    def raiseTestException(self):
-        raise self.TEST_EXCEPTION
-
-    def assertAfterWithManagerInvariantsWithError(self, mock_manager):
-        self.assertTrue(mock_manager.context_called)
-        self.assertTrue(mock_manager.enter_called)
-        self.assertTrue(mock_manager.exit_called)
-        self.assertEqual(mock_manager.exit_args[0], RuntimeError)
-        self.assertEqual(mock_manager.exit_args[1], self.TEST_EXCEPTION)
-
-    def assertAfterWithGeneratorInvariantsWithError(self, mock_generator):
-        self.assertTrue(mock_generator.yielded)
-        self.assertTrue(mock_generator.stopped)
-
-
-class NonexceptionalTestCase(unittest.TestCase, ContextmanagerAssertionMixin):
-    def testInlineGeneratorSyntax(self):
-        with mock_contextmanager_generator():
-            pass
-
-    def testUnboundGenerator(self):
-        mock = mock_contextmanager_generator()
-        with mock:
-            pass
-        self.assertAfterWithManagerInvariantsNoError(mock)
-
-    def testInlineGeneratorBoundSyntax(self):
-        with mock_contextmanager_generator() as foo:
-            self.assertInWithGeneratorInvariants(foo)
-        # FIXME: In the future, we'll try to keep the bound names from leaking
-        self.assertAfterWithGeneratorInvariantsNoError(foo)
-
-    def testInlineGeneratorBoundToExistingVariable(self):
-        foo = None
-        with mock_contextmanager_generator() as foo:
-            self.assertInWithGeneratorInvariants(foo)
-        self.assertAfterWithGeneratorInvariantsNoError(foo)
-
-    def testInlineGeneratorBoundToDottedVariable(self):
-        with mock_contextmanager_generator() as self.foo:
-            self.assertInWithGeneratorInvariants(self.foo)
-        self.assertAfterWithGeneratorInvariantsNoError(self.foo)
-
-    def testBoundGenerator(self):
-        mock = mock_contextmanager_generator()
-        with mock as foo:
-            self.assertInWithGeneratorInvariants(foo)
-            self.assertInWithManagerInvariants(mock)
-        self.assertAfterWithGeneratorInvariantsNoError(foo)
-        self.assertAfterWithManagerInvariantsNoError(mock)
-
-    def testNestedSingleStatements(self):
-        mock_a = mock_contextmanager_generator()
-        with mock_a as foo:
-            mock_b = mock_contextmanager_generator()
-            with mock_b as bar:
-                self.assertInWithManagerInvariants(mock_a)
-                self.assertInWithManagerInvariants(mock_b)
-                self.assertInWithGeneratorInvariants(foo)
-                self.assertInWithGeneratorInvariants(bar)
-            self.assertAfterWithManagerInvariantsNoError(mock_b)
-            self.assertAfterWithGeneratorInvariantsNoError(bar)
-            self.assertInWithManagerInvariants(mock_a)
-            self.assertInWithGeneratorInvariants(foo)
-        self.assertAfterWithManagerInvariantsNoError(mock_a)
-        self.assertAfterWithGeneratorInvariantsNoError(foo)
-
-
-class NestedNonexceptionalTestCase(unittest.TestCase,
-    ContextmanagerAssertionMixin):
-    def testSingleArgInlineGeneratorSyntax(self):
-        with nested(mock_contextmanager_generator()):
-            pass
-
-    def testSingleArgUnbound(self):
-        mock_contextmanager = mock_contextmanager_generator()
-        mock_nested = MockNested(mock_contextmanager)
-        with mock_nested:
-            self.assertInWithManagerInvariants(mock_contextmanager)
-            self.assertInWithManagerInvariants(mock_nested)
-        self.assertAfterWithManagerInvariantsNoError(mock_contextmanager)
-        self.assertAfterWithManagerInvariantsNoError(mock_nested)
-
-    def testSingleArgBoundToNonTuple(self):
-        m = mock_contextmanager_generator()
-        # This will bind all the arguments to nested() into a single list
-        # assigned to foo.
-        with nested(m) as foo:
-            self.assertInWithManagerInvariants(m)
-        self.assertAfterWithManagerInvariantsNoError(m)
-
-    def testSingleArgBoundToSingleElementParenthesizedList(self):
-        m = mock_contextmanager_generator()
-        # This will bind all the arguments to nested() into a single list
-        # assigned to foo.
-        # FIXME: what should this do:  with nested(m) as (foo,):
-        with nested(m) as (foo):
-            self.assertInWithManagerInvariants(m)
-        self.assertAfterWithManagerInvariantsNoError(m)
-
-    def testSingleArgBoundToMultipleElementTupleError(self):
-        def shouldThrowValueError():
-            with nested(mock_contextmanager_generator()) as (foo, bar):
-                pass
-        self.assertRaises(ValueError, shouldThrowValueError)
-
-    def testSingleArgUnbound(self):
-        mock_contextmanager = mock_contextmanager_generator()
-        mock_nested = MockNested(mock_contextmanager)
-        with mock_nested:
-            self.assertInWithManagerInvariants(mock_contextmanager)
-            self.assertInWithManagerInvariants(mock_nested)
-        self.assertAfterWithManagerInvariantsNoError(mock_contextmanager)
-        self.assertAfterWithManagerInvariantsNoError(mock_nested)
-
-    def testMultipleArgUnbound(self):
-        m = mock_contextmanager_generator()
-        n = mock_contextmanager_generator()
-        o = mock_contextmanager_generator()
-        mock_nested = MockNested(m, n, o)
-        with mock_nested:
-            self.assertInWithManagerInvariants(m)
-            self.assertInWithManagerInvariants(n)
-            self.assertInWithManagerInvariants(o)
-            self.assertInWithManagerInvariants(mock_nested)
-        self.assertAfterWithManagerInvariantsNoError(m)
-        self.assertAfterWithManagerInvariantsNoError(n)
-        self.assertAfterWithManagerInvariantsNoError(o)
-        self.assertAfterWithManagerInvariantsNoError(mock_nested)
-
-    def testMultipleArgBound(self):
-        mock_nested = MockNested(mock_contextmanager_generator(),
-            mock_contextmanager_generator(), mock_contextmanager_generator())
-        with mock_nested as (m, n, o):
-            self.assertInWithGeneratorInvariants(m)
-            self.assertInWithGeneratorInvariants(n)
-            self.assertInWithGeneratorInvariants(o)
-            self.assertInWithManagerInvariants(mock_nested)
-        self.assertAfterWithGeneratorInvariantsNoError(m)
-        self.assertAfterWithGeneratorInvariantsNoError(n)
-        self.assertAfterWithGeneratorInvariantsNoError(o)
-        self.assertAfterWithManagerInvariantsNoError(mock_nested)
-
-
-class ExceptionalTestCase(unittest.TestCase, ContextmanagerAssertionMixin):
-    def testSingleResource(self):
-        cm = mock_contextmanager_generator()
-        def shouldThrow():
-            with cm as self.resource:
-                self.assertInWithManagerInvariants(cm)
-                self.assertInWithGeneratorInvariants(self.resource)
-                self.raiseTestException()
-        self.assertRaises(RuntimeError, shouldThrow)
-        self.assertAfterWithManagerInvariantsWithError(cm)
-        self.assertAfterWithGeneratorInvariantsWithError(self.resource)
-
-    def testNestedSingleStatements(self):
-        mock_a = mock_contextmanager_generator()
-        mock_b = mock_contextmanager_generator()
-        def shouldThrow():
-            with mock_a as self.foo:
-                with mock_b as self.bar:
-                    self.assertInWithManagerInvariants(mock_a)
-                    self.assertInWithManagerInvariants(mock_b)
-                    self.assertInWithGeneratorInvariants(self.foo)
-                    self.assertInWithGeneratorInvariants(self.bar)
-                    self.raiseTestException()
-        self.assertRaises(RuntimeError, shouldThrow)
-        self.assertAfterWithManagerInvariantsWithError(mock_a)
-        self.assertAfterWithManagerInvariantsWithError(mock_b)
-        self.assertAfterWithGeneratorInvariantsWithError(self.foo)
-        self.assertAfterWithGeneratorInvariantsWithError(self.bar)
-
-    def testMultipleResourcesInSingleStatement(self):
-        cm_a = mock_contextmanager_generator()
-        cm_b = mock_contextmanager_generator()
-        mock_nested = MockNested(cm_a, cm_b)
-        def shouldThrow():
-            with mock_nested as (self.resource_a, self.resource_b):
-                self.assertInWithManagerInvariants(cm_a)
-                self.assertInWithManagerInvariants(cm_b)
-                self.assertInWithManagerInvariants(mock_nested)
-                self.assertInWithGeneratorInvariants(self.resource_a)
-                self.assertInWithGeneratorInvariants(self.resource_b)
-                self.raiseTestException()
-        self.assertRaises(RuntimeError, shouldThrow)
-        self.assertAfterWithManagerInvariantsWithError(cm_a)
-        self.assertAfterWithManagerInvariantsWithError(cm_b)
-        self.assertAfterWithManagerInvariantsWithError(mock_nested)
-        self.assertAfterWithGeneratorInvariantsWithError(self.resource_a)
-        self.assertAfterWithGeneratorInvariantsWithError(self.resource_b)
-
-    def testNestedExceptionBeforeInnerStatement(self):
-        mock_a = mock_contextmanager_generator()
-        mock_b = mock_contextmanager_generator()
-        self.bar = None
-        def shouldThrow():
-            with mock_a as self.foo:
-                self.assertInWithManagerInvariants(mock_a)
-                self.assertInWithGeneratorInvariants(self.foo)
-                self.raiseTestException()
-                with mock_b as self.bar:
-                    pass
-        self.assertRaises(RuntimeError, shouldThrow)
-        self.assertAfterWithManagerInvariantsWithError(mock_a)
-        self.assertAfterWithGeneratorInvariantsWithError(self.foo)
-
-        # The inner statement stuff should never have been touched
-        self.assertEqual(self.bar, None)
-        self.assertFalse(mock_b.context_called)
-        self.assertFalse(mock_b.enter_called)
-        self.assertFalse(mock_b.exit_called)
-        self.assertEqual(mock_b.exit_args, None)
-
-    def testNestedExceptionAfterInnerStatement(self):
-        mock_a = mock_contextmanager_generator()
-        mock_b = mock_contextmanager_generator()
-        def shouldThrow():
-            with mock_a as self.foo:
-                with mock_b as self.bar:
-                    self.assertInWithManagerInvariants(mock_a)
-                    self.assertInWithManagerInvariants(mock_b)
-                    self.assertInWithGeneratorInvariants(self.foo)
-                    self.assertInWithGeneratorInvariants(self.bar)
-                self.raiseTestException()
-        self.assertRaises(RuntimeError, shouldThrow)
-        self.assertAfterWithManagerInvariantsWithError(mock_a)
-        self.assertAfterWithManagerInvariantsNoError(mock_b)
-        self.assertAfterWithGeneratorInvariantsWithError(self.foo)
-        self.assertAfterWithGeneratorInvariantsNoError(self.bar)
-
-
-class NonLocalFlowControlTestCase(unittest.TestCase):
-
-    def testWithBreak(self):
-        counter = 0
-        while True:
-            counter += 1
-            with mock_contextmanager_generator():
-                counter += 10
-                break
-            counter += 100 # Not reached
-        self.assertEqual(counter, 11)
-
-    def testWithContinue(self):
-        counter = 0
-        while True:
-            counter += 1
-            if counter > 2:
-                break
-            with mock_contextmanager_generator():
-                counter += 10
-                continue
-            counter += 100 # Not reached
-        self.assertEqual(counter, 12)
-
-    def testWithReturn(self):
-        def foo():
-            counter = 0
-            while True:
-                counter += 1
-                with mock_contextmanager_generator():
-                    counter += 10
-                    return counter
-                counter += 100 # Not reached
-        self.assertEqual(foo(), 11)
-
-    def testWithYield(self):
-        def gen():
-            with mock_contextmanager_generator():
-                yield 12
-                yield 13
-        x = list(gen())
-        self.assertEqual(x, [12, 13])
-
-    def testWithRaise(self):
-        counter = 0
-        try:
-            counter += 1
-            with mock_contextmanager_generator():
-                counter += 10
-                raise RuntimeError
-            counter += 100 # Not reached
-        except RuntimeError:
-            self.assertEqual(counter, 11)
-        else:
-            self.fail("Didn't raise RuntimeError")
-
-
-class AssignmentTargetTestCase(unittest.TestCase):
-
-    def testSingleComplexTarget(self):
-        targets = {1: [0, 1, 2]}
-        with mock_contextmanager_generator() as targets[1][0]:
-            self.assertEqual(targets.keys(), [1])
-            self.assertEqual(targets[1][0].__class__, MockResource)
-        with mock_contextmanager_generator() as targets.values()[0][1]:
-            self.assertEqual(targets.keys(), [1])
-            self.assertEqual(targets[1][1].__class__, MockResource)
-        with mock_contextmanager_generator() as targets[2]:
-            keys = targets.keys()
-            keys.sort()
-            self.assertEqual(keys, [1, 2])
-        class C: pass
-        blah = C()
-        with mock_contextmanager_generator() as blah.foo:
-            self.assertEqual(hasattr(blah, "foo"), True)
-
-    def testMultipleComplexTargets(self):
-        class C:
-            def __context__(self): return self
-            def __enter__(self): return 1, 2, 3
-            def __exit__(self, *a): pass
-        targets = {1: [0, 1, 2]}
-        with C() as (targets[1][0], targets[1][1], targets[1][2]):
-            self.assertEqual(targets, {1: [1, 2, 3]})
-        with C() as (targets.values()[0][2], targets.values()[0][1], targets.values()[0][0]):
-            self.assertEqual(targets, {1: [3, 2, 1]})
-        with C() as (targets[1], targets[2], targets[3]):
-            self.assertEqual(targets, {1: 1, 2: 2, 3: 3})
-        class B: pass
-        blah = B()
-        with C() as (blah.one, blah.two, blah.three):
-            self.assertEqual(blah.one, 1)
-            self.assertEqual(blah.two, 2)
-            self.assertEqual(blah.three, 3)
-
-
-def test_main():
-    run_unittest(FailureTestCase, NonexceptionalTestCase,
-                 NestedNonexceptionalTestCase, ExceptionalTestCase,
-                 NonLocalFlowControlTestCase,
-                 AssignmentTargetTestCase)
-
-
-if __name__ == '__main__':
-    test_main()
+#!/usr/bin/env python\r
+\r
+"""Unit tests for the with statement specified in PEP 343."""\r
+\r
+__author__ = "Mike Bland"\r
+__email__ = "mbland at acm dot org"\r
+\r
+import unittest\r
+from test.contextmanager import GeneratorContextManager\r
+from test.nested import nested\r
+from test.test_support import run_unittest\r
+\r
+\r
+class MockContextManager(GeneratorContextManager):\r
+    def __init__(self, gen):\r
+        GeneratorContextManager.__init__(self, gen)\r
+        self.context_called = False\r
+        self.enter_called = False\r
+        self.exit_called = False\r
+        self.exit_args = None\r
+\r
+    def __context__(self):\r
+        self.context_called = True\r
+        return GeneratorContextManager.__context__(self)\r
+\r
+    def __enter__(self):\r
+        self.enter_called = True\r
+        return GeneratorContextManager.__enter__(self)\r
+\r
+    def __exit__(self, type, value, traceback):\r
+        self.exit_called = True\r
+        self.exit_args = (type, value, traceback)\r
+        return GeneratorContextManager.__exit__(self, type, value, traceback)\r
+\r
+\r
+def mock_contextmanager(func):\r
+    def helper(*args, **kwds):\r
+        return MockContextManager(func(*args, **kwds))\r
+    return helper\r
+\r
+\r
+class MockResource(object):\r
+    def __init__(self):\r
+        self.yielded = False\r
+        self.stopped = False\r
+\r
+\r
+@mock_contextmanager\r
+def mock_contextmanager_generator():\r
+    mock = MockResource()\r
+    try:\r
+        mock.yielded = True\r
+        yield mock\r
+    finally:\r
+        mock.stopped = True\r
+\r
+\r
+class MockNested(nested):\r
+    def __init__(self, *contexts):\r
+        nested.__init__(self, *contexts)\r
+        self.context_called = False\r
+        self.enter_called = False\r
+        self.exit_called = False\r
+        self.exit_args = None\r
+\r
+    def __context__(self):\r
+        self.context_called = True\r
+        return nested.__context__(self)\r
+\r
+    def __enter__(self):\r
+        self.enter_called = True\r
+        return nested.__enter__(self)\r
+\r
+    def __exit__(self, *exc_info):\r
+        self.exit_called = True\r
+        self.exit_args = exc_info\r
+        return nested.__exit__(self, *exc_info)\r
+\r
+\r
+class FailureTestCase(unittest.TestCase):\r
+    def testNameError(self):\r
+        def fooNotDeclared():\r
+            with foo: pass\r
+        self.assertRaises(NameError, fooNotDeclared)\r
+\r
+    def testContextAttributeError(self):\r
+        class LacksContext(object):\r
+            def __enter__(self):\r
+                pass\r
+\r
+            def __exit__(self, type, value, traceback):\r
+                pass\r
+\r
+        def fooLacksContext():\r
+            foo = LacksContext()\r
+            with foo: pass\r
+        self.assertRaises(AttributeError, fooLacksContext)\r
+\r
+    def testEnterAttributeError(self):\r
+        class LacksEnter(object):\r
+            def __context__(self):\r
+                pass\r
+\r
+            def __exit__(self, type, value, traceback):\r
+                pass\r
+\r
+        def fooLacksEnter():\r
+            foo = LacksEnter()\r
+            with foo: pass\r
+        self.assertRaises(AttributeError, fooLacksEnter)\r
+\r
+    def testExitAttributeError(self):\r
+        class LacksExit(object):\r
+            def __context__(self):\r
+                pass\r
+\r
+            def __enter__(self):\r
+                pass\r
+\r
+        def fooLacksExit():\r
+            foo = LacksExit()\r
+            with foo: pass\r
+        self.assertRaises(AttributeError, fooLacksExit)\r
+\r
+    def assertRaisesSyntaxError(self, codestr):\r
+        def shouldRaiseSyntaxError(s):\r
+            compile(s, '', 'single')\r
+        self.assertRaises(SyntaxError, shouldRaiseSyntaxError, codestr)\r
+\r
+    def testAssignmentToNoneError(self):\r
+        self.assertRaisesSyntaxError('with mock as None:\n  pass')\r
+        self.assertRaisesSyntaxError(\r
+            'with mock as (None):\n'\r
+            '  pass')\r
+\r
+    def testAssignmentToEmptyTupleError(self):\r
+        self.assertRaisesSyntaxError(\r
+            'with mock as ():\n'\r
+            '  pass')\r
+\r
+    def testAssignmentToTupleOnlyContainingNoneError(self):\r
+        self.assertRaisesSyntaxError('with mock as None,:\n  pass')\r
+        self.assertRaisesSyntaxError(\r
+            'with mock as (None,):\n'\r
+            '  pass')\r
+\r
+    def testAssignmentToTupleContainingNoneError(self):\r
+        self.assertRaisesSyntaxError(\r
+            'with mock as (foo, None, bar):\n'\r
+            '  pass')\r
+\r
+    def testContextThrows(self):\r
+        class ContextThrows(object):\r
+            def __context__(self):\r
+                raise RuntimeError("Context threw")\r
+\r
+        def shouldThrow():\r
+            ct = ContextThrows()\r
+            self.foo = None\r
+            with ct as self.foo:\r
+                pass\r
+        self.assertRaises(RuntimeError, shouldThrow)\r
+        self.assertEqual(self.foo, None)\r
+\r
+    def testEnterThrows(self):\r
+        class EnterThrows(object):\r
+            def __context__(self):\r
+                return self\r
+\r
+            def __enter__(self):\r
+                raise RuntimeError("Context threw")\r
+\r
+            def __exit__(self, *args):\r
+                pass\r
+\r
+        def shouldThrow():\r
+            ct = EnterThrows()\r
+            self.foo = None\r
+            with ct as self.foo:\r
+                pass\r
+        self.assertRaises(RuntimeError, shouldThrow)\r
+        self.assertEqual(self.foo, None)\r
+\r
+    def testExitThrows(self):\r
+        class ExitThrows(object):\r
+            def __context__(self):\r
+                return self\r
+            def __enter__(self):\r
+                return\r
+            def __exit__(self, *args):\r
+                raise RuntimeError(42)\r
+        def shouldThrow():\r
+            with ExitThrows():\r
+                pass\r
+        self.assertRaises(RuntimeError, shouldThrow)\r
+\r
+class ContextmanagerAssertionMixin(object):\r
+    TEST_EXCEPTION = RuntimeError("test exception")\r
+\r
+    def assertInWithManagerInvariants(self, mock_manager):\r
+        self.assertTrue(mock_manager.context_called)\r
+        self.assertTrue(mock_manager.enter_called)\r
+        self.assertFalse(mock_manager.exit_called)\r
+        self.assertEqual(mock_manager.exit_args, None)\r
+\r
+    def assertAfterWithManagerInvariants(self, mock_manager, exit_args):\r
+        self.assertTrue(mock_manager.context_called)\r
+        self.assertTrue(mock_manager.enter_called)\r
+        self.assertTrue(mock_manager.exit_called)\r
+        self.assertEqual(mock_manager.exit_args, exit_args)\r
+\r
+    def assertAfterWithManagerInvariantsNoError(self, mock_manager):\r
+        self.assertAfterWithManagerInvariants(mock_manager,\r
+            (None, None, None))\r
+\r
+    def assertInWithGeneratorInvariants(self, mock_generator):\r
+        self.assertTrue(mock_generator.yielded)\r
+        self.assertFalse(mock_generator.stopped)\r
+\r
+    def assertAfterWithGeneratorInvariantsNoError(self, mock_generator):\r
+        self.assertTrue(mock_generator.yielded)\r
+        self.assertTrue(mock_generator.stopped)\r
+\r
+    def raiseTestException(self):\r
+        raise self.TEST_EXCEPTION\r
+\r
+    def assertAfterWithManagerInvariantsWithError(self, mock_manager):\r
+        self.assertTrue(mock_manager.context_called)\r
+        self.assertTrue(mock_manager.enter_called)\r
+        self.assertTrue(mock_manager.exit_called)\r
+        self.assertEqual(mock_manager.exit_args[0], RuntimeError)\r
+        self.assertEqual(mock_manager.exit_args[1], self.TEST_EXCEPTION)\r
+\r
+    def assertAfterWithGeneratorInvariantsWithError(self, mock_generator):\r
+        self.assertTrue(mock_generator.yielded)\r
+        self.assertTrue(mock_generator.stopped)\r
+\r
+\r
+class NonexceptionalTestCase(unittest.TestCase, ContextmanagerAssertionMixin):\r
+    def testInlineGeneratorSyntax(self):\r
+        with mock_contextmanager_generator():\r
+            pass\r
+\r
+    def testUnboundGenerator(self):\r
+        mock = mock_contextmanager_generator()\r
+        with mock:\r
+            pass\r
+        self.assertAfterWithManagerInvariantsNoError(mock)\r
+\r
+    def testInlineGeneratorBoundSyntax(self):\r
+        with mock_contextmanager_generator() as foo:\r
+            self.assertInWithGeneratorInvariants(foo)\r
+        # FIXME: In the future, we'll try to keep the bound names from leaking\r
+        self.assertAfterWithGeneratorInvariantsNoError(foo)\r
+\r
+    def testInlineGeneratorBoundToExistingVariable(self):\r
+        foo = None\r
+        with mock_contextmanager_generator() as foo:\r
+            self.assertInWithGeneratorInvariants(foo)\r
+        self.assertAfterWithGeneratorInvariantsNoError(foo)\r
+\r
+    def testInlineGeneratorBoundToDottedVariable(self):\r
+        with mock_contextmanager_generator() as self.foo:\r
+            self.assertInWithGeneratorInvariants(self.foo)\r
+        self.assertAfterWithGeneratorInvariantsNoError(self.foo)\r
+\r
+    def testBoundGenerator(self):\r
+        mock = mock_contextmanager_generator()\r
+        with mock as foo:\r
+            self.assertInWithGeneratorInvariants(foo)\r
+            self.assertInWithManagerInvariants(mock)\r
+        self.assertAfterWithGeneratorInvariantsNoError(foo)\r
+        self.assertAfterWithManagerInvariantsNoError(mock)\r
+\r
+    def testNestedSingleStatements(self):\r
+        mock_a = mock_contextmanager_generator()\r
+        with mock_a as foo:\r
+            mock_b = mock_contextmanager_generator()\r
+            with mock_b as bar:\r
+                self.assertInWithManagerInvariants(mock_a)\r
+                self.assertInWithManagerInvariants(mock_b)\r
+                self.assertInWithGeneratorInvariants(foo)\r
+                self.assertInWithGeneratorInvariants(bar)\r
+            self.assertAfterWithManagerInvariantsNoError(mock_b)\r
+            self.assertAfterWithGeneratorInvariantsNoError(bar)\r
+            self.assertInWithManagerInvariants(mock_a)\r
+            self.assertInWithGeneratorInvariants(foo)\r
+        self.assertAfterWithManagerInvariantsNoError(mock_a)\r
+        self.assertAfterWithGeneratorInvariantsNoError(foo)\r
+\r
+\r
+class NestedNonexceptionalTestCase(unittest.TestCase,\r
+    ContextmanagerAssertionMixin):\r
+    def testSingleArgInlineGeneratorSyntax(self):\r
+        with nested(mock_contextmanager_generator()):\r
+            pass\r
+\r
+    def testSingleArgUnbound(self):\r
+        mock_contextmanager = mock_contextmanager_generator()\r
+        mock_nested = MockNested(mock_contextmanager)\r
+        with mock_nested:\r
+            self.assertInWithManagerInvariants(mock_contextmanager)\r
+            self.assertInWithManagerInvariants(mock_nested)\r
+        self.assertAfterWithManagerInvariantsNoError(mock_contextmanager)\r
+        self.assertAfterWithManagerInvariantsNoError(mock_nested)\r
+\r
+    def testSingleArgBoundToNonTuple(self):\r
+        m = mock_contextmanager_generator()\r
+        # This will bind all the arguments to nested() into a single list\r
+        # assigned to foo.\r
+        with nested(m) as foo:\r
+            self.assertInWithManagerInvariants(m)\r
+        self.assertAfterWithManagerInvariantsNoError(m)\r
+\r
+    def testSingleArgBoundToSingleElementParenthesizedList(self):\r
+        m = mock_contextmanager_generator()\r
+        # This will bind all the arguments to nested() into a single list\r
+        # assigned to foo.\r
+        # FIXME: what should this do:  with nested(m) as (foo,):\r
+        with nested(m) as (foo):\r
+            self.assertInWithManagerInvariants(m)\r
+        self.assertAfterWithManagerInvariantsNoError(m)\r
+\r
+    def testSingleArgBoundToMultipleElementTupleError(self):\r
+        def shouldThrowValueError():\r
+            with nested(mock_contextmanager_generator()) as (foo, bar):\r
+                pass\r
+        self.assertRaises(ValueError, shouldThrowValueError)\r
+\r
+    def testSingleArgUnbound(self):\r
+        mock_contextmanager = mock_contextmanager_generator()\r
+        mock_nested = MockNested(mock_contextmanager)\r
+        with mock_nested:\r
+            self.assertInWithManagerInvariants(mock_contextmanager)\r
+            self.assertInWithManagerInvariants(mock_nested)\r
+        self.assertAfterWithManagerInvariantsNoError(mock_contextmanager)\r
+        self.assertAfterWithManagerInvariantsNoError(mock_nested)\r
+\r
+    def testMultipleArgUnbound(self):\r
+        m = mock_contextmanager_generator()\r
+        n = mock_contextmanager_generator()\r
+        o = mock_contextmanager_generator()\r
+        mock_nested = MockNested(m, n, o)\r
+        with mock_nested:\r
+            self.assertInWithManagerInvariants(m)\r
+            self.assertInWithManagerInvariants(n)\r
+            self.assertInWithManagerInvariants(o)\r
+            self.assertInWithManagerInvariants(mock_nested)\r
+        self.assertAfterWithManagerInvariantsNoError(m)\r
+        self.assertAfterWithManagerInvariantsNoError(n)\r
+        self.assertAfterWithManagerInvariantsNoError(o)\r
+        self.assertAfterWithManagerInvariantsNoError(mock_nested)\r
+\r
+    def testMultipleArgBound(self):\r
+        mock_nested = MockNested(mock_contextmanager_generator(),\r
+            mock_contextmanager_generator(), mock_contextmanager_generator())\r
+        with mock_nested as (m, n, o):\r
+            self.assertInWithGeneratorInvariants(m)\r
+            self.assertInWithGeneratorInvariants(n)\r
+            self.assertInWithGeneratorInvariants(o)\r
+            self.assertInWithManagerInvariants(mock_nested)\r
+        self.assertAfterWithGeneratorInvariantsNoError(m)\r
+        self.assertAfterWithGeneratorInvariantsNoError(n)\r
+        self.assertAfterWithGeneratorInvariantsNoError(o)\r
+        self.assertAfterWithManagerInvariantsNoError(mock_nested)\r
+\r
+\r
+class ExceptionalTestCase(unittest.TestCase, ContextmanagerAssertionMixin):\r
+    def testSingleResource(self):\r
+        cm = mock_contextmanager_generator()\r
+        def shouldThrow():\r
+            with cm as self.resource:\r
+                self.assertInWithManagerInvariants(cm)\r
+                self.assertInWithGeneratorInvariants(self.resource)\r
+                self.raiseTestException()\r
+        self.assertRaises(RuntimeError, shouldThrow)\r
+        self.assertAfterWithManagerInvariantsWithError(cm)\r
+        self.assertAfterWithGeneratorInvariantsWithError(self.resource)\r
+\r
+    def testNestedSingleStatements(self):\r
+        mock_a = mock_contextmanager_generator()\r
+        mock_b = mock_contextmanager_generator()\r
+        def shouldThrow():\r
+            with mock_a as self.foo:\r
+                with mock_b as self.bar:\r
+                    self.assertInWithManagerInvariants(mock_a)\r
+                    self.assertInWithManagerInvariants(mock_b)\r
+                    self.assertInWithGeneratorInvariants(self.foo)\r
+                    self.assertInWithGeneratorInvariants(self.bar)\r
+                    self.raiseTestException()\r
+        self.assertRaises(RuntimeError, shouldThrow)\r
+        self.assertAfterWithManagerInvariantsWithError(mock_a)\r
+        self.assertAfterWithManagerInvariantsWithError(mock_b)\r
+        self.assertAfterWithGeneratorInvariantsWithError(self.foo)\r
+        self.assertAfterWithGeneratorInvariantsWithError(self.bar)\r
+\r
+    def testMultipleResourcesInSingleStatement(self):\r
+        cm_a = mock_contextmanager_generator()\r
+        cm_b = mock_contextmanager_generator()\r
+        mock_nested = MockNested(cm_a, cm_b)\r
+        def shouldThrow():\r
+            with mock_nested as (self.resource_a, self.resource_b):\r
+                self.assertInWithManagerInvariants(cm_a)\r
+                self.assertInWithManagerInvariants(cm_b)\r
+                self.assertInWithManagerInvariants(mock_nested)\r
+                self.assertInWithGeneratorInvariants(self.resource_a)\r
+                self.assertInWithGeneratorInvariants(self.resource_b)\r
+                self.raiseTestException()\r
+        self.assertRaises(RuntimeError, shouldThrow)\r
+        self.assertAfterWithManagerInvariantsWithError(cm_a)\r
+        self.assertAfterWithManagerInvariantsWithError(cm_b)\r
+        self.assertAfterWithManagerInvariantsWithError(mock_nested)\r
+        self.assertAfterWithGeneratorInvariantsWithError(self.resource_a)\r
+        self.assertAfterWithGeneratorInvariantsWithError(self.resource_b)\r
+\r
+    def testNestedExceptionBeforeInnerStatement(self):\r
+        mock_a = mock_contextmanager_generator()\r
+        mock_b = mock_contextmanager_generator()\r
+        self.bar = None\r
+        def shouldThrow():\r
+            with mock_a as self.foo:\r
+                self.assertInWithManagerInvariants(mock_a)\r
+                self.assertInWithGeneratorInvariants(self.foo)\r
+                self.raiseTestException()\r
+                with mock_b as self.bar:\r
+                    pass\r
+        self.assertRaises(RuntimeError, shouldThrow)\r
+        self.assertAfterWithManagerInvariantsWithError(mock_a)\r
+        self.assertAfterWithGeneratorInvariantsWithError(self.foo)\r
+\r
+        # The inner statement stuff should never have been touched\r
+        self.assertEqual(self.bar, None)\r
+        self.assertFalse(mock_b.context_called)\r
+        self.assertFalse(mock_b.enter_called)\r
+        self.assertFalse(mock_b.exit_called)\r
+        self.assertEqual(mock_b.exit_args, None)\r
+\r
+    def testNestedExceptionAfterInnerStatement(self):\r
+        mock_a = mock_contextmanager_generator()\r
+        mock_b = mock_contextmanager_generator()\r
+        def shouldThrow():\r
+            with mock_a as self.foo:\r
+                with mock_b as self.bar:\r
+                    self.assertInWithManagerInvariants(mock_a)\r
+                    self.assertInWithManagerInvariants(mock_b)\r
+                    self.assertInWithGeneratorInvariants(self.foo)\r
+                    self.assertInWithGeneratorInvariants(self.bar)\r
+                self.raiseTestException()\r
+        self.assertRaises(RuntimeError, shouldThrow)\r
+        self.assertAfterWithManagerInvariantsWithError(mock_a)\r
+        self.assertAfterWithManagerInvariantsNoError(mock_b)\r
+        self.assertAfterWithGeneratorInvariantsWithError(self.foo)\r
+        self.assertAfterWithGeneratorInvariantsNoError(self.bar)\r
+\r
+\r
+class NonLocalFlowControlTestCase(unittest.TestCase):\r
+\r
+    def testWithBreak(self):\r
+        counter = 0\r
+        while True:\r
+            counter += 1\r
+            with mock_contextmanager_generator():\r
+                counter += 10\r
+                break\r
+            counter += 100 # Not reached\r
+        self.assertEqual(counter, 11)\r
+\r
+    def testWithContinue(self):\r
+        counter = 0\r
+        while True:\r
+            counter += 1\r
+            if counter > 2:\r
+                break\r
+            with mock_contextmanager_generator():\r
+                counter += 10\r
+                continue\r
+            counter += 100 # Not reached\r
+        self.assertEqual(counter, 12)\r
+\r
+    def testWithReturn(self):\r
+        def foo():\r
+            counter = 0\r
+            while True:\r
+                counter += 1\r
+                with mock_contextmanager_generator():\r
+                    counter += 10\r
+                    return counter\r
+                counter += 100 # Not reached\r
+        self.assertEqual(foo(), 11)\r
+\r
+    def testWithYield(self):\r
+        def gen():\r
+            with mock_contextmanager_generator():\r
+                yield 12\r
+                yield 13\r
+        x = list(gen())\r
+        self.assertEqual(x, [12, 13])\r
+\r
+    def testWithRaise(self):\r
+        counter = 0\r
+        try:\r
+            counter += 1\r
+            with mock_contextmanager_generator():\r
+                counter += 10\r
+                raise RuntimeError\r
+            counter += 100 # Not reached\r
+        except RuntimeError:\r
+            self.assertEqual(counter, 11)\r
+        else:\r
+            self.fail("Didn't raise RuntimeError")\r
+\r
+\r
+class AssignmentTargetTestCase(unittest.TestCase):\r
+\r
+    def testSingleComplexTarget(self):\r
+        targets = {1: [0, 1, 2]}\r
+        with mock_contextmanager_generator() as targets[1][0]:\r
+            self.assertEqual(targets.keys(), [1])\r
+            self.assertEqual(targets[1][0].__class__, MockResource)\r
+        with mock_contextmanager_generator() as targets.values()[0][1]:\r
+            self.assertEqual(targets.keys(), [1])\r
+            self.assertEqual(targets[1][1].__class__, MockResource)\r
+        with mock_contextmanager_generator() as targets[2]:\r
+            keys = targets.keys()\r
+            keys.sort()\r
+            self.assertEqual(keys, [1, 2])\r
+        class C: pass\r
+        blah = C()\r
+        with mock_contextmanager_generator() as blah.foo:\r
+            self.assertEqual(hasattr(blah, "foo"), True)\r
+\r
+    def testMultipleComplexTargets(self):\r
+        class C:\r
+            def __context__(self): return self\r
+            def __enter__(self): return 1, 2, 3\r
+            def __exit__(self, *a): pass\r
+        targets = {1: [0, 1, 2]}\r
+        with C() as (targets[1][0], targets[1][1], targets[1][2]):\r
+            self.assertEqual(targets, {1: [1, 2, 3]})\r
+        with C() as (targets.values()[0][2], targets.values()[0][1], targets.values()[0][0]):\r
+            self.assertEqual(targets, {1: [3, 2, 1]})\r
+        with C() as (targets[1], targets[2], targets[3]):\r
+            self.assertEqual(targets, {1: 1, 2: 2, 3: 3})\r
+        class B: pass\r
+        blah = B()\r
+        with C() as (blah.one, blah.two, blah.three):\r
+            self.assertEqual(blah.one, 1)\r
+            self.assertEqual(blah.two, 2)\r
+            self.assertEqual(blah.three, 3)\r
+\r
+\r
+def test_main():\r
+    run_unittest(FailureTestCase, NonexceptionalTestCase,\r
+                 NestedNonexceptionalTestCase, ExceptionalTestCase,\r
+                 NonLocalFlowControlTestCase,\r
+                 AssignmentTargetTestCase)\r
+\r
+\r
+if __name__ == '__main__':\r
+    test_main()\r

diff --git a/Parser/asdl.py b/Parser/asdl.py
index 2128732cfbad95cbd4c7793b142da8c435e6db64..3a693088f20874b45f076493dc866a5e64799e13 100644 (file)
--- a/Parser/asdl.py
+++ b/Parser/asdl.py
@@ -38,7 +38,7 @@ class Id(Token):
 
     def __str__(self):
         return self.value
-        
+
 class String(Token):
     def __init__(self, value, lineno):
         self.type = 'String'
@@ -71,7 +71,7 @@ class ASDLScanner(spark.GenericScanner, object):
         # XXX doesn't distinguish upper vs. lower, which is
         # significant for ASDL.
         self.rv.append(Id(s, self.lineno))
-        
+
     def t_string(self, s):
         r'"[^"]*"'
         self.rv.append(String(s, self.lineno))
@@ -123,7 +123,7 @@ class ASDLParser(spark.GenericParser, object):
             raise ASDLSyntaxError(module.lineno,
                                   msg="expected 'module', found %s" % module)
         return Module(name, definitions, version)
-        
+
     def p_version(self, (version, V)):
         "version ::= Id String"
         if version.value != "version":

diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 1f63df9f80fe1e6b19417fd0d3133144edfd0ecc..ff091dd229cda3b43595f267657a9923f7338368 100755 (executable)
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -354,7 +354,7 @@ class PyTypesDeclareVisitor(PickleVisitor):
             for f in prod.fields:
                 self.emit('"%s",' % f.name, 1)
             self.emit("};", 0)
-        
+
     def visitSum(self, sum, name):
         self.emit("PyTypeObject *%s_type;" % name, 0)
         if sum.attributes:
@@ -373,7 +373,7 @@ class PyTypesDeclareVisitor(PickleVisitor):
         self.emit("static PyObject* ast2obj_%s(%s);" % (name, ptype), 0)
         for t in sum.types:
             self.visitConstructor(t, name)
-            
+
     def visitConstructor(self, cons, name):
         self.emit("PyTypeObject *%s_type;" % cons.name, 0)
         if cons.fields:
@@ -405,7 +405,7 @@ static PyTypeObject* make_type(char *type, PyTypeObject* base, char**fields, int
         }
         PyTuple_SET_ITEM(fnames, i, field);
     }
-    result = PyObject_CallFunction((PyObject*)&PyType_Type, "s(O){sOss}", 
+    result = PyObject_CallFunction((PyObject*)&PyType_Type, "s(O){sOss}",
                     type, base, "_fields", fnames, "__module__", "_ast");
     Py_DECREF(fnames);
     return (PyTypeObject*)result;
@@ -481,35 +481,35 @@ static PyObject* ast2obj_int(bool b)
             fields = name.value+"_fields"
         else:
             fields = "NULL"
-        self.emit('%s_type = make_type("%s", AST_type, %s, %d);' % 
+        self.emit('%s_type = make_type("%s", AST_type, %s, %d);' %
                         (name, name, fields, len(prod.fields)), 1)
         self.emit("if (!%s_type) return 0;" % name, 1)
-        
+
     def visitSum(self, sum, name):
         self.emit('%s_type = make_type("%s", AST_type, NULL, 0);' % (name, name), 1)
         self.emit("if (!%s_type) return 0;" % name, 1)
         if sum.attributes:
-            self.emit("if (!add_attributes(%s_type, %s_attributes, %d)) return 0;" % 
+            self.emit("if (!add_attributes(%s_type, %s_attributes, %d)) return 0;" %
                             (name, name, len(sum.attributes)), 1)
         else:
             self.emit("if (!add_attributes(%s_type, NULL, 0)) return 0;" % name, 1)
         simple = is_simple(sum)
         for t in sum.types:
             self.visitConstructor(t, name, simple)
-            
+
     def visitConstructor(self, cons, name, simple):
         if cons.fields:
             fields = cons.name.value+"_fields"
         else:
             fields = "NULL"
-        self.emit('%s_type = make_type("%s", %s_type, %s, %d);' % 
+        self.emit('%s_type = make_type("%s", %s_type, %s, %d);' %
                             (cons.name, cons.name, name, fields, len(cons.fields)), 1)
         self.emit("if (!%s_type) return 0;" % cons.name, 1)
         if simple:
             self.emit("%s_singleton = PyType_GenericNew(%s_type, NULL, NULL);" %
                              (cons.name, cons.name), 1)
             self.emit("if (!%s_singleton) return 0;" % cons.name, 1)
-                             
+
 class ASTModuleVisitor(PickleVisitor):
 
     def visitModule(self, mod):
@@ -533,15 +533,15 @@ class ASTModuleVisitor(PickleVisitor):
 
     def visitProduct(self, prod, name):
         self.addObj(name)
-        
+
     def visitSum(self, sum, name):
         self.addObj(name)
         for t in sum.types:
             self.visitConstructor(t, name)
-            
+
     def visitConstructor(self, cons, name):
         self.addObj(cons.name)
-        
+
     def addObj(self, name):
         self.emit('if(PyDict_SetItemString(d, "%s", (PyObject*)%s_type) < 0) return;' % (name, name), 1)
 
@@ -609,7 +609,7 @@ class ObjVisitor(PickleVisitor):
             self.emit("if (!value) goto failed;", 1)
             self.emit('PyObject_SetAttrString(result, "%s", value);' % a.name, 1)
         self.func_end()
-        
+
     def simpleSum(self, sum, name):
         self.emit("PyObject* ast2obj_%s(%s_ty o)" % (name, name), 0)
         self.emit("{", 0)