Author: Antonio Cuni <[email protected]>
Branch: py3k
Changeset: r56111:b58eee8de596
Date: 2012-07-17 18:10 +0200
http://bitbucket.org/pypy/pypy/changeset/b58eee8de596/

Log:    merge heads

diff --git a/pypy/interpreter/astcompiler/test/test_astbuilder.py 
b/pypy/interpreter/astcompiler/test/test_astbuilder.py
--- a/pypy/interpreter/astcompiler/test/test_astbuilder.py
+++ b/pypy/interpreter/astcompiler/test/test_astbuilder.py
@@ -1120,7 +1120,7 @@
         assert space.eq_w(s.s, space.wrap(japan))
  
     def test_string_bug(self):
-        py3k_skip('fixme')
+        py.test.py3k_skip('fixme')
         space = self.space
         source = '# -*- encoding: utf8 -*-\nstuff = "x \xc3\xa9 \\n"\n'
         info = pyparse.CompileInfo("<test>", "exec")
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to