Author: Manuel Jacob
Branch: refactor-str-types
Changeset: r65815:97254954bebc
Date: 2013-07-29 18:20 +0200
http://bitbucket.org/pypy/pypy/changeset/97254954bebc/
Log: Fix test_setobject.py.
diff --git a/pypy/objspace/std/test/test_setobject.py
b/pypy/objspace/std/test/test_setobject.py
--- a/pypy/objspace/std/test/test_setobject.py
+++ b/pypy/objspace/std/test/test_setobject.py
@@ -81,9 +81,9 @@
assert space.is_true(self.space.eq(result, W_SetObject(space,
self.space.wrap(""))))
def test_create_set_from_list(self):
+ from pypy.interpreter.baseobjspace import W_Root
from pypy.objspace.std.setobject import ObjectSetStrategy,
StringSetStrategy, UnicodeSetStrategy
from pypy.objspace.std.floatobject import W_FloatObject
- from pypy.objspace.std.model import W_Object
w = self.space.wrap
intstr = self.space.fromcache(IntegerSetStrategy)
@@ -114,7 +114,7 @@
_initialize_set(self.space, w_set, w_list)
assert w_set.strategy is self.space.fromcache(ObjectSetStrategy)
for item in w_set.strategy.unerase(w_set.sstorage):
- assert isinstance(item, W_Object)
+ assert isinstance(item, W_Root)
w_list = W_ListObject(self.space, [w(1.0), w(2.0), w(3.0)])
w_set = W_SetObject(self.space)
diff --git a/pypy/tool/pytest/apptest.py b/pypy/tool/pytest/apptest.py
--- a/pypy/tool/pytest/apptest.py
+++ b/pypy/tool/pytest/apptest.py
@@ -34,6 +34,7 @@
try:
target(*args)
except OperationError, e:
+ raise
tb = sys.exc_info()[2]
if e.match(space, space.w_KeyboardInterrupt):
raise KeyboardInterrupt, KeyboardInterrupt(), tb
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
