Author: Matti Picus <matti.pi...@gmail.com>
Branch: unicode-utf8-py3
Changeset: r95371:c700c69056ba
Date: 2018-11-26 22:23 -0800
http://bitbucket.org/pypy/pypy/changeset/c700c69056ba/
Log: merge py3.5 into branch
diff --git a/extra_tests/cffi_tests/cffi1/test_parse_c_type.py
b/extra_tests/cffi_tests/cffi1/test_parse_c_type.py
--- a/extra_tests/cffi_tests/cffi1/test_parse_c_type.py
+++ b/extra_tests/cffi_tests/cffi1/test_parse_c_type.py
@@ -4,7 +4,7 @@
from cffi import cffi_opcode
if '__pypy__' in sys.builtin_module_names:
- py.test.skip("not available on pypy")
+ py.test.skip("not available on pypy", allow_module_level=True)
cffi_dir = os.path.dirname(cffi_opcode.__file__)
diff --git a/extra_tests/test_decimal.py b/extra_tests/test_decimal.py
--- a/extra_tests/test_decimal.py
+++ b/extra_tests/test_decimal.py
@@ -4,7 +4,7 @@
import pickle
import sys
-from support import import_fresh_module
+from .support import import_fresh_module
C = import_fresh_module('decimal', fresh=['_decimal'])
P = import_fresh_module('decimal', blocked=['_decimal'])
diff --git a/lib_pypy/cffi/recompiler.py b/lib_pypy/cffi/recompiler.py
--- a/lib_pypy/cffi/recompiler.py
+++ b/lib_pypy/cffi/recompiler.py
@@ -1542,7 +1542,7 @@
def _verify(ffi, module_name, preamble, *args, **kwds):
# FOR TESTS ONLY
- from testing.udir import udir
+ from .testing.udir import udir
import imp
assert module_name not in sys.modules, "module name conflict: %r" % (
module_name,)
diff --git a/pypy/module/_rawffi/alt/test/test_ffitype.py
b/pypy/module/_rawffi/alt/test/test_ffitype.py
--- a/pypy/module/_rawffi/alt/test/test_ffitype.py
+++ b/pypy/module/_rawffi/alt/test/test_ffitype.py
@@ -1,6 +1,5 @@
-from pypy.module._rawffi.alt.test.test_funcptr import BaseAppTestFFI
-
-class AppTestFFIType(BaseAppTestFFI):
+class AppTestFFIType(object):
+ spaceconfig = dict(usemodules=('_rawffi',))
def test_simple_types(self):
from _rawffi.alt import types
@@ -8,7 +7,7 @@
assert str(types.uint) == "<ffi type uint>"
assert types.sint.name == 'sint'
assert types.uint.name == 'uint'
-
+
def test_sizeof(self):
from _rawffi.alt import types
assert types.sbyte.sizeof() == 1
@@ -36,4 +35,3 @@
assert x is types.char_p
x = types.Pointer(types.unichar)
assert x is types.unichar_p
-
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
