Skip to contentSkip to conversation

utils/checkpackagelib: fix python3 compatibility

PATCH New Joseph Kogut 2 participants 3 messages Sep 3, 2018 – Sep 4, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 utils/checkpackagelib: fix python3 compatibility

---
 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(-)
utils/checkpackagelib/lib.py +1 -1
index 91f4ad49b7..06b147a470 100644
@@ -1,6 +1,6 @@
 # See utils/checkpackagelib/readme.txt before editing this file.
 
-from base import _CheckFunction
+from .base import _CheckFunction
 
 
 class ConsecutiveEmptyLines(_CheckFunction):
utils/checkpackagelib/lib_config.py +5 -5
index 1d273f1c5f..f6dc583a08 100644
@@ -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):
utils/checkpackagelib/lib_hash.py +5 -5
index 6d4cc9fd62..3ddd88bae9 100644
@@ -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):
utils/checkpackagelib/lib_mk.py +5 -5
index 86e9aa2d97..263b7b010d 100644
@@ -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):
utils/checkpackagelib/lib_patch.py +2 -2
index 555621afa1..4b1b48e6ca 100644
@@ -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):
Signature · 1 line
2.18.0
#2 lore raw

PATCH 1/1 utils/checkpackagelib: fix python3 compatibility

Hi Ricardo,

Quoted 7 lines · Ricardo Martincoski

Hello,

I guess you missed this one:
http://patchwork.ozlabs.org/patch/956517/
Could you review and/or test that instead?

Yeah, I didn't notice this one. I'll check it out and follow up.

Quoted 3 lines

Regards,
Ricardo

Thanks,
Joseph