@@ -1,6 +1,6 @@
# See utils/checkpackagelib/readme.txt before editing this file.
-from base import _CheckFunction
+from .base import _CheckFunction
class ConsecutiveEmptyLines(_CheckFunction):
@@ -5,11 +5,11 @@
import re
-from base import _CheckFunction
-from lib import ConsecutiveEmptyLines # noqa: F401
-from lib import EmptyLastLine # noqa: F401
-from lib import NewlineAtEof # noqa: F401
-from lib import TrailingSpace # noqa: F401
+from .base import _CheckFunction
+from .lib import ConsecutiveEmptyLines # noqa: F401
+from .lib import EmptyLastLine # noqa: F401
+from .lib import NewlineAtEof # noqa: F401
+from .lib import TrailingSpace # noqa: F401
def _empty_or_comment(text):
@@ -5,11 +5,11 @@
import re
-from base import _CheckFunction
-from lib import ConsecutiveEmptyLines # noqa: F401
-from lib import EmptyLastLine # noqa: F401
-from lib import NewlineAtEof # noqa: F401
-from lib import TrailingSpace # noqa: F401
+from .base import _CheckFunction
+from .lib import ConsecutiveEmptyLines # noqa: F401
+from .lib import EmptyLastLine # noqa: F401
+from .lib import NewlineAtEof # noqa: F401
+from .lib import TrailingSpace # noqa: F401
def _empty_line_or_comment(text):
@@ -6,11 +6,11 @@
import re
-from base import _CheckFunction
-from lib import ConsecutiveEmptyLines # noqa: F401
-from lib import EmptyLastLine # noqa: F401
-from lib import NewlineAtEof # noqa: F401
-from lib import TrailingSpace # noqa: F401
+from .base import _CheckFunction
+from .lib import ConsecutiveEmptyLines # noqa: F401
+from .lib import EmptyLastLine # noqa: F401
+from .lib import NewlineAtEof # noqa: F401
+from .lib import TrailingSpace # noqa: F401
class Indent(_CheckFunction):
@@ -5,8 +5,8 @@
import re
-from base import _CheckFunction
-from lib import NewlineAtEof # noqa: F401
+from .base import _CheckFunction
+from .lib import NewlineAtEof # noqa: F401
class ApplyOrder(_CheckFunction):
The syntax for explicit relative imports was introduced in Python2.6, and the implicit relative imports were removed in Python3. According to PEP394, Python source files that use the `python` shebang line should be compatible with both Python2 and Python3. With this patch, users of distros where Python3 is the default are able to use check-package Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu> --- utils/checkpackagelib/lib.py | 2 +- utils/checkpackagelib/lib_config.py | 10 +++++----- utils/checkpackagelib/lib_hash.py | 10 +++++----- utils/checkpackagelib/lib_mk.py | 10 +++++----- utils/checkpackagelib/lib_patch.py | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-)