Author: Ronan Lamy <ronan.l...@gmail.com>
Branch:
Changeset: r93554:34217fe03263
Date: 2017-12-22 18:28 +0100
http://bitbucket.org/pypy/pypy/changeset/34217fe03263/
Log: Make relative imports explicit
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_anon.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_anon.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_anon.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_anon.py
@@ -1,6 +1,6 @@
import pytest
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
class TestAnon(BaseCTypesTestChecker):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_array.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_array.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_array.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_array.py
@@ -1,6 +1,6 @@
import pytest
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
formats = "bBhHiIlLqQfd"
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_array_in_pointer.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_array_in_pointer.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_array_in_pointer.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_array_in_pointer.py
@@ -2,7 +2,7 @@
from binascii import hexlify
import re
import py
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
def dump(obj):
# helper function to dump memory contents in hex, with a hyphen
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_as_parameter.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_as_parameter.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_as_parameter.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_as_parameter.py
@@ -1,6 +1,6 @@
from ctypes import *
import pytest
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
def setup_module(mod):
import conftest
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_base.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_base.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_base.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_base.py
@@ -1,4 +1,4 @@
-from support import WhiteBoxTests
+from .support import WhiteBoxTests
from ctypes import *
@@ -18,7 +18,7 @@
x = X()
assert x.y._base is x
assert x.y._index == 1
-
+
def test_array(self):
X = POINTER(c_int) * 24
x = X()
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_bitfields.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_bitfields.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_bitfields.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_bitfields.py
@@ -1,6 +1,6 @@
import pytest
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
import os
import ctypes
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_buffers.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_buffers.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_buffers.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_buffers.py
@@ -1,5 +1,5 @@
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
class TestStringBuffer(BaseCTypesTestChecker):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_callbacks.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_callbacks.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_callbacks.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_callbacks.py
@@ -1,6 +1,6 @@
from ctypes import *
import pytest
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
class TestCallbacks(BaseCTypesTestChecker):
functype = CFUNCTYPE
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_cast.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_cast.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_cast.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_cast.py
@@ -1,6 +1,6 @@
from ctypes import *
import sys, py
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
def setup_module(mod):
import conftest
@@ -65,7 +65,7 @@
def test_char_p(self):
# This didn't work: bad argument to internal function
s = c_char_p("hiho")
-
+
assert cast(cast(s, c_void_p), c_char_p).value == (
"hiho")
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_cfuncs.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_cfuncs.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_cfuncs.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_cfuncs.py
@@ -3,7 +3,7 @@
from ctypes import *
import py
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
def setup_module(mod):
import conftest
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_extra.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_extra.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_extra.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_extra.py
@@ -5,7 +5,7 @@
import py
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
class TestExtra(BaseCTypesTestChecker):
def test_primitive_pointer(self):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_functions.py
@@ -9,7 +9,7 @@
from ctypes import *
import sys
import pytest
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
try:
WINFUNCTYPE
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_keepalive.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_keepalive.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_keepalive.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_keepalive.py
@@ -1,5 +1,4 @@
import py
-import support
from ctypes import *
import sys
@@ -96,7 +95,7 @@
assert x._objects == {'0': n._objects, '1': n._objects}
assert x._objects['0'] is n._objects
assert n._objects is not None
-
+
def test_pointer_setitem(self):
x = c_int(2)
y = c_int(3)
@@ -165,7 +164,7 @@
s.x=3
a[3].p = pointer(s)
- assert a._objects['0:3']['1'] is s
+ assert a._objects['0:3']['1'] is s
def test_struct_with_inlined_array(self):
class S(Structure):
@@ -190,7 +189,7 @@
def test_struct_within_struct(self):
class R(Structure):
_fields_ = [('p', POINTER(c_int))]
-
+
class S(Structure):
_fields_ = [('b', c_int),
('r', R)]
@@ -208,7 +207,7 @@
def test_union_within_union(self):
class R(Union):
_fields_ = [('p', POINTER(c_int))]
-
+
class S(Union):
_fields_ = [('b', c_int),
('r', R)]
@@ -217,10 +216,10 @@
stuff = c_int(2)
s.r.p = pointer(stuff)
assert s._objects == {'0:1': {'1': stuff}}
-
+
r = R()
s.r = r
- # obscure
+ # obscure
assert s._objects == {'1': {}, '0:1': {'1': stuff}}
def test_c_char_p(self):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_memfunctions.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_memfunctions.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_memfunctions.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_memfunctions.py
@@ -2,7 +2,7 @@
import py
import sys
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
class TestMemFunctions(BaseCTypesTestChecker):
def test_memmove(self):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_numbers.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_numbers.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_numbers.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_numbers.py
@@ -1,6 +1,6 @@
import pytest
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
import sys, struct
def valid_ranges(*types):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_pointers.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_pointers.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_pointers.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_pointers.py
@@ -1,6 +1,6 @@
import py
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
ctype_types = [c_byte, c_ubyte, c_short, c_ushort, c_int, c_uint,
c_long, c_ulong, c_longlong, c_ulonglong, c_double, c_float]
@@ -18,7 +18,7 @@
ffitype = P.get_ffi_argtype()
assert P.get_ffi_argtype() is ffitype
assert ffitype.deref_pointer() is c_int.get_ffi_argtype()
-
+
def test_pointer_crash(self):
class A(POINTER(c_ulong)):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_prototypes.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_prototypes.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_prototypes.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_prototypes.py
@@ -1,6 +1,6 @@
import pytest
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
# IMPORTANT INFO:
#
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_repr.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_repr.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_repr.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_repr.py
@@ -1,5 +1,5 @@
import py
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
from ctypes import *
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_simplesubclasses.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_simplesubclasses.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_simplesubclasses.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_simplesubclasses.py
@@ -1,5 +1,5 @@
import py
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
from ctypes import *
class MyInt(c_int):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_sizes.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_sizes.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_sizes.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_sizes.py
@@ -1,7 +1,7 @@
# Test specifically-sized containers.
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
class TestSizes(BaseCTypesTestChecker):
def test_8(self):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_slicing.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_slicing.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_slicing.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_slicing.py
@@ -1,5 +1,5 @@
import pytest
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
from ctypes import *
def setup_module(mod):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_stringptr.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_stringptr.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_stringptr.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_stringptr.py
@@ -1,5 +1,5 @@
import pytest
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
from ctypes import *
def setup_module(mod):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_strings.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_strings.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_strings.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_strings.py
@@ -1,7 +1,7 @@
import py
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
class TestStringArray(BaseCTypesTestChecker):
def test_one(self):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_struct_fields.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_struct_fields.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_struct_fields.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_struct_fields.py
@@ -1,5 +1,5 @@
import pytest
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
from ctypes import *
class TestStructFields(BaseCTypesTestChecker):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_structures.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_structures.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_structures.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_structures.py
@@ -1,6 +1,6 @@
from ctypes import *
from struct import calcsize
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
import pytest
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_unicode.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_unicode.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_unicode.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_unicode.py
@@ -1,7 +1,7 @@
# coding: latin-1
import ctypes
import pytest
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
try:
ctypes.c_wchar
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_unions.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_unions.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_unions.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_unions.py
@@ -1,6 +1,6 @@
import sys
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
class TestUnion(BaseCTypesTestChecker):
def test_getattr(self):
@@ -28,4 +28,4 @@
u = UnionofStuff()
u.one.x = 3
assert u.two.x == 3
-
+
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_values.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_values.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_values.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_values.py
@@ -4,7 +4,7 @@
import pytest
from ctypes import *
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
def setup_module(mod):
import conftest
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_varsize_struct.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_varsize_struct.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_varsize_struct.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_varsize_struct.py
@@ -1,5 +1,5 @@
import pytest
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
from ctypes import *
class TestVarSize(BaseCTypesTestChecker):
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_win32.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_win32.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_win32.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_win32.py
@@ -2,7 +2,7 @@
from ctypes import *
from ctypes.test import is_resource_enabled
-from support import BaseCTypesTestChecker
+from .support import BaseCTypesTestChecker
import pytest
import sys
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
