merge trunk

--HG--
branch : trunk

_py/code/_assertionnew.py

@@ -132,7 +132,7 @@ class DebugInterpreter(ast.NodeVisitor):
                 raise Failure()
             return None, None
         else:
-            raise AssertionError("can't handle {0}".format(node))
+            raise AssertionError("can't handle %s" %(node,))
 
     def _compile(self, source, mode="eval"):
         return compile(source, "<assertion interpretation>", mode)

_py/test/plugin/pytest_assertion.py

@@ -8,8 +8,8 @@ def pytest_addoption(parser):
         help="disable python assert expression reinterpretation."),
 
 def pytest_configure(config):
-    if sys.platform.startswith("java"):
-        return # XXX assertions don't work yet with jython 2.5.1
+    #if sys.platform.startswith("java"):
+    #    return # XXX assertions don't work yet with jython 2.5.1
 
     if not config.getvalue("noassert") and not config.getvalue("nomagic"):
         warn_about_missing_assertion()

testing/code/test_assertion.py

@@ -1,6 +1,6 @@
 import py
 
-pytestmark = py.test.mark.skipif("sys.platform.startswith('java')")
+#pytestmark = py.test.mark.skipif("sys.platform.startswith('java')")
 
 def exvalue():
     return py.std.sys.exc_info()[1]