diff --git a/.pylintrc b/.pylintrc index d0e57e0..59cbbf6 100644 --- a/.pylintrc +++ b/.pylintrc @@ -11,7 +11,7 @@ jobs=1 # We probably want to fix these eventually, but in the meantime, these # ones are relatively harmless. -disable=multiple-imports,missing-docstring,wrong-import-position,locally-disabled,invalid-name,unused-argument,fixme,global-statement,redefined-variable-type,using-constant-test,unused-variable,file-ignored,simplifiable-if-statement,relative-import +disable=multiple-imports,missing-docstring,locally-disabled,invalid-name,unused-argument,fixme,global-statement,redefined-variable-type,using-constant-test,unused-variable,file-ignored,simplifiable-if-statement [REPORTS] diff --git a/redo/builder.py b/redo/builder.py index 17a521b..47c8a1e 100644 --- a/redo/builder.py +++ b/redo/builder.py @@ -1,8 +1,7 @@ import sys, os, errno, stat, signal, time -import cycles, env, jobserver, state, paths -from helpers import unlink, close_on_exec -import logs -from logs import debug2, err, warn, meta, check_tty +from . import cycles, env, jobserver, logs, state, paths +from .helpers import unlink, close_on_exec +from .logs import debug2, err, warn, meta, check_tty def _nice(t): diff --git a/redo/cmd_always.py b/redo/cmd_always.py index a9e1460..c4e392c 100644 --- a/redo/cmd_always.py +++ b/redo/cmd_always.py @@ -1,5 +1,5 @@ import sys, os -import env, state +from . import env, state def main(): diff --git a/redo/cmd_ifchange.py b/redo/cmd_ifchange.py index bf7d2dd..442b802 100644 --- a/redo/cmd_ifchange.py +++ b/redo/cmd_ifchange.py @@ -1,6 +1,6 @@ import os, sys, traceback -import env, state, builder, jobserver, deps -from logs import debug2, err +from . import env, state, builder, jobserver, deps +from .logs import debug2, err def should_build(t): diff --git a/redo/cmd_ifcreate.py b/redo/cmd_ifcreate.py index 5fb6dd9..5d9c216 100644 --- a/redo/cmd_ifcreate.py +++ b/redo/cmd_ifcreate.py @@ -1,6 +1,6 @@ import sys, os -import env, state -from logs import err +from . import env, state +from .logs import err def main(): diff --git a/redo/cmd_log.py b/redo/cmd_log.py index 141e209..b741dbb 100644 --- a/redo/cmd_log.py +++ b/redo/cmd_log.py @@ -1,7 +1,7 @@ import errno, fcntl, os, re, struct, sys, time import termios -from atoi import atoi -import env, logs, options, state +from .atoi import atoi +from . import env, logs, options, state optspec = """ redo-log [options...] [targets...] diff --git a/redo/cmd_ood.py b/redo/cmd_ood.py index 54bfb1c..d9ae08b 100644 --- a/redo/cmd_ood.py +++ b/redo/cmd_ood.py @@ -1,6 +1,6 @@ import sys, os -import env, state, deps -from logs import err +from . import env, state, deps +from .logs import err cache = {} diff --git a/redo/cmd_redo.py b/redo/cmd_redo.py index c48b1f3..c4d1653 100644 --- a/redo/cmd_redo.py +++ b/redo/cmd_redo.py @@ -14,9 +14,9 @@ # limitations under the License. # import sys, os, traceback -import env, options, state, builder, jobserver -from atoi import atoi -from logs import warn, err +from . import env, options, state, builder, jobserver +from .atoi import atoi +from .logs import warn, err optspec = """ redo [targets...] @@ -46,7 +46,7 @@ def main(): targets = extra if opt.version: - import version + from . import version print version.TAG sys.exit(0) if opt.debug: diff --git a/redo/cmd_sources.py b/redo/cmd_sources.py index 407a0c6..70a0bff 100644 --- a/redo/cmd_sources.py +++ b/redo/cmd_sources.py @@ -1,6 +1,6 @@ import sys, os -import state, env -from logs import err +from . import state, env +from .logs import err def main(): diff --git a/redo/cmd_stamp.py b/redo/cmd_stamp.py index 35c2d41..ab58469 100644 --- a/redo/cmd_stamp.py +++ b/redo/cmd_stamp.py @@ -1,6 +1,6 @@ import sys, os -import env, state -from logs import err, debug2 +from . import env, state +from .logs import err, debug2 def main(): diff --git a/redo/cmd_targets.py b/redo/cmd_targets.py index 6f42982..99289e4 100644 --- a/redo/cmd_targets.py +++ b/redo/cmd_targets.py @@ -1,6 +1,6 @@ import sys, os -import env, state -from logs import err +from . import env, state +from .logs import err def main(): diff --git a/redo/cmd_unlocked.py b/redo/cmd_unlocked.py index 28db641..511fdfa 100644 --- a/redo/cmd_unlocked.py +++ b/redo/cmd_unlocked.py @@ -1,6 +1,6 @@ import sys, os -import env, state -from logs import err +from . import env, state +from .logs import err def main(): diff --git a/redo/cmd_whichdo.py b/redo/cmd_whichdo.py index 1343448..7b74646 100644 --- a/redo/cmd_whichdo.py +++ b/redo/cmd_whichdo.py @@ -1,6 +1,6 @@ import sys, os -import env, paths -from logs import err +from . import env, paths +from .logs import err def main(): diff --git a/redo/deps.py b/redo/deps.py index 9956b9b..a1aa6f1 100644 --- a/redo/deps.py +++ b/redo/deps.py @@ -1,6 +1,6 @@ import os -import cycles, env, state -from logs import debug +from . import cycles, env, state +from .logs import debug CLEAN = 0 DIRTY = 1 diff --git a/redo/env.py b/redo/env.py index 9a95e46..5724b7d 100644 --- a/redo/env.py +++ b/redo/env.py @@ -1,5 +1,5 @@ import os, sys -from atoi import atoi +from .atoi import atoi is_toplevel = False diff --git a/redo/jobserver.py b/redo/jobserver.py index 1b0ab11..4c3dbd1 100644 --- a/redo/jobserver.py +++ b/redo/jobserver.py @@ -74,9 +74,9 @@ # simpler :) # import sys, os, errno, select, fcntl, signal -from atoi import atoi -from helpers import close_on_exec -import state, env +from . import state, env +from .atoi import atoi +from .helpers import close_on_exec _toplevel = 0 _mytokens = 1 diff --git a/redo/logs.py b/redo/logs.py index f8bfa39..5b83906 100644 --- a/redo/logs.py +++ b/redo/logs.py @@ -1,5 +1,5 @@ import os, re, sys, time -import env +from . import env RED = GREEN = YELLOW = BOLD = PLAIN = None diff --git a/redo/paths.py b/redo/paths.py index 6aba1fa..5600089 100644 --- a/redo/paths.py +++ b/redo/paths.py @@ -1,6 +1,6 @@ import os -import env -from logs import debug2 +from . import env +from .logs import debug2 def _default_do_files(filename): diff --git a/redo/state.py b/redo/state.py index f05107e..8e3cdb7 100644 --- a/redo/state.py +++ b/redo/state.py @@ -1,7 +1,7 @@ import sys, os, errno, stat, fcntl, sqlite3 -import cycles, env -from helpers import unlink, close_on_exec, join -from logs import warn, debug2, debug3 +from . import cycles, env +from .helpers import unlink, close_on_exec, join +from .logs import warn, debug2, debug3 SCHEMA_VER = 2 TIMEOUT = 60 diff --git a/redo/version/__init__.py b/redo/version/__init__.py index 2863a1d..581c2ec 100644 --- a/redo/version/__init__.py +++ b/redo/version/__init__.py @@ -1 +1 @@ -from _version import COMMIT, TAG, DATE +from ._version import COMMIT, TAG, DATE