[pypy-commit] pypy default: cleanup
bdkearns
noreply at buildbot.pypy.org
Fri May 2 01:48:18 CEST 2014
Author: Brian Kearns <bdkearns at gmail.com>
Branch:
Changeset: r71161:1bb8ba9c96df
Date: 2014-05-01 19:46 -0400
http://bitbucket.org/pypy/pypy/changeset/1bb8ba9c96df/
Log: cleanup
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
@@ -249,9 +249,8 @@
raises(TypeError, ast.Num, 1, 2, lineno=0)
def test_issue1680_nonseq(self):
+ # Test deleting an attribute manually
- # Test deleting an attribute manually
-
_ast = self.ast
mod = self.get_ast("self.attr")
assert isinstance(mod, _ast.Module)
@@ -292,9 +291,8 @@
assert not hasattr(mod.body[0], 'name')
def test_issue1680_seq(self):
+ # Test deleting an attribute manually
- # Test deleting an attribute manually
-
_ast = self.ast
mod = self.get_ast("self.attr")
assert isinstance(mod, _ast.Module)
@@ -397,9 +395,8 @@
import ast
num_node = ast.Num(n=2, lineno=2, col_offset=3)
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
@@ -407,7 +404,7 @@
assert num_node.n == 2
assert num_node.lineno == 2
num_node2 = copy.deepcopy(num_node)
-
+
def test_issue1673_Num_fullinit(self):
import ast
import copy
@@ -418,7 +415,7 @@
assert num_node.col_offset == num_node2.col_offset
dict_res = num_node2.__dict__
assert dict_res == {'n':2, 'lineno':2, 'col_offset':3}
-
+
def test_issue1673_Str(self):
import ast
import copy
diff --git a/pypy/objspace/std/test/test_typeobject.py b/pypy/objspace/std/test/test_typeobject.py
--- a/pypy/objspace/std/test/test_typeobject.py
+++ b/pypy/objspace/std/test/test_typeobject.py
@@ -60,7 +60,6 @@
class AppTestTypeObject:
-
def test_abstract_methods(self):
class X(object):
pass
@@ -427,8 +426,7 @@
assert f.__call__() == ((), {})
assert f.__call__("hello", "world") == (("hello", "world"), {})
assert f.__call__(5, bla=6) == ((5,), {"bla": 6})
- assert f.__call__(a=1, b=2, c=3) == ((), {"a": 1, "b": 2,
- "c": 3})
+ assert f.__call__(a=1, b=2, c=3) == ((), {"a": 1, "b": 2, "c": 3})
def test_multipleinheritance_fail(self):
try:
@@ -539,7 +537,6 @@
assert ImmutableDoc.__doc__ == 'foo'
def test_metaclass_conflict(self):
-
class T1(type):
pass
class T2(type):
@@ -555,7 +552,7 @@
def test_metaclass_choice(self):
events = []
-
+
class T1(type):
def __new__(*args):
events.append(args)
@@ -577,7 +574,7 @@
assert type(D1) is T1
assert type(C) is T1
assert type(G) is T1
-
+
def test_descr_typecheck(self):
raises(TypeError,type.__dict__['__name__'].__get__,1)
raises(TypeError,type.__dict__['__mro__'].__get__,1)
@@ -806,7 +803,7 @@
z2 = Z2()
z2.__class__ = Z1
assert z2.__class__ == Z1
-
+
class I(int):
pass
class F(float):
@@ -825,13 +822,12 @@
pass
i = I()
-
i2 = I()
i.__class__ = I2
i2.__class__ = I
assert i.__class__ == I2
assert i2.__class__ == I
-
+
i3 = I3()
raises(TypeError, "i3.__class__ = I2")
i3.__class__ = I4
More information about the pypy-commit
mailing list