[pypy-commit] pypy default: merge three heads

[wenzhuman]

Author: wenzhuman <manwenzhu at gamil.com>
Branch: 
Changeset: r71770:10608abfd026
Date: 2014-05-28 16:56 -0400
http://bitbucket.org/pypy/pypy/changeset/10608abfd026/

Log:	merge three heads

diff --git a/pypy/module/_ast/test/test_ast.py b/pypy/module/_ast/test/test_ast.py
--- a/pypy/module/_ast/test/test_ast.py
+++ b/pypy/module/_ast/test/test_ast.py
@@ -397,13 +397,14 @@
         dict_res = num_node.__dict__
         assert dict_res == {'n':2, 'lineno':2, 'col_offset':3}
 
+    
     def test_issue1673_Num_notfullinit(self):
         import ast
         import copy
         num_node = ast.Num(n=2,lineno=2)
         assert num_node.n == 2
         assert num_node.lineno == 2
-        num_node2 = copy.deepcopy(num_node)
+        num_node = copy.deepcopy(num_node)
 
     def test_issue1673_Num_fullinit(self):
         import ast
@@ -416,6 +417,7 @@
         dict_res = num_node2.__dict__
         assert dict_res == {'n':2, 'lineno':2, 'col_offset':3}
 
+          
     def test_issue1673_Str(self):
         import ast
         import copy