From d7ade0104c26382579270716215d223db345daf9 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Fri, 3 Aug 2012 17:39:05 +0300 Subject: [PATCH] Used absolute imports. PEP0008 discourages relative imports in quite strict manner: Relative imports for intra-package imports are highly discouraged. Always use the absolute package path for all imports. So, let's not have them. Change-Id: I7622060910bf0f62ebc55c2777b3b14159e8a7e7 --- gitbuildsys/cmd_build.py | 7 ++----- gitbuildsys/cmd_changelog.py | 6 ++---- gitbuildsys/cmd_chroot.py | 5 ++--- gitbuildsys/cmd_export.py | 7 ++----- gitbuildsys/cmd_import.py | 2 +- gitbuildsys/cmd_remotebuild.py | 9 ++++----- gitbuildsys/cmd_submit.py | 5 +++-- gitbuildsys/conf.py | 3 +-- gitbuildsys/oscapi.py | 5 ++--- gitbuildsys/runner.py | 2 +- gitbuildsys/utils.py | 5 +++-- 11 files changed, 23 insertions(+), 33 deletions(-) diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py index 959750b..ab55382 100644 --- a/gitbuildsys/cmd_build.py +++ b/gitbuildsys/cmd_build.py @@ -29,11 +29,8 @@ import shutil import base64 from urlparse import urlsplit, urlunsplit -import msger -import utils -import runner -import errors -from conf import configmgr +from gitbuildsys import msger, utils, runner, errors +from gitbuildsys.conf import configmgr from gbp.scripts.buildpackage_rpm import main as gbp_build from gbp.rpm.git import GitRepositoryError, RpmGitRepository diff --git a/gitbuildsys/cmd_changelog.py b/gitbuildsys/cmd_changelog.py index c21b1ce..bc74647 100644 --- a/gitbuildsys/cmd_changelog.py +++ b/gitbuildsys/cmd_changelog.py @@ -25,10 +25,8 @@ import glob import subprocess import shutil -import msger -import utils - -from conf import configmgr +from gitbuildsys import msger, utils +from gitbuildsys.conf import configmgr from gbp.rpm.git import GitRepositoryError, RpmGitRepository diff --git a/gitbuildsys/cmd_chroot.py b/gitbuildsys/cmd_chroot.py index a7f6211..249f729 100644 --- a/gitbuildsys/cmd_chroot.py +++ b/gitbuildsys/cmd_chroot.py @@ -18,12 +18,11 @@ """Implementation of subcmd: chroot """ - import os import subprocess -import msger -from conf import configmgr +from gitbuildsys import msger +from gitbuildsys.conf import configmgr def do(opts, args): diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py index e6cebda..57221a4 100644 --- a/gitbuildsys/cmd_export.py +++ b/gitbuildsys/cmd_export.py @@ -23,11 +23,8 @@ import os import shutil import errno -import msger -import runner -import utils -import errors -from conf import configmgr +from gitbuildsys import msger, runner, utils, errors +from gitbuildsys.conf import configmgr from gbp.scripts.buildpackage_rpm import main as gbp_build from gbp.rpm.git import GitRepositoryError, RpmGitRepository diff --git a/gitbuildsys/cmd_import.py b/gitbuildsys/cmd_import.py index 8d3b52a..a764189 100644 --- a/gitbuildsys/cmd_import.py +++ b/gitbuildsys/cmd_import.py @@ -20,7 +20,7 @@ """ import os -import msger +from gitbuildsys import msger from gbp.scripts.import_srpm import main as gbp_import_srpm from gbp.scripts.import_orig_rpm import main as gbp_import_orig diff --git a/gitbuildsys/cmd_remotebuild.py b/gitbuildsys/cmd_remotebuild.py index d335de1..a82a35a 100644 --- a/gitbuildsys/cmd_remotebuild.py +++ b/gitbuildsys/cmd_remotebuild.py @@ -23,12 +23,11 @@ import os import glob import shutil -import msger -import errors -import utils -from conf import configmgr -from oscapi import OSC, OSCError +from gitbuildsys import msger, errors, utils + +from gitbuildsys.conf import configmgr +from gitbuildsys.oscapi import OSC, OSCError import gbp.rpm from gbp.scripts.buildpackage_rpm import main as gbp_build diff --git a/gitbuildsys/cmd_submit.py b/gitbuildsys/cmd_submit.py index 7417172..6ef9f29 100644 --- a/gitbuildsys/cmd_submit.py +++ b/gitbuildsys/cmd_submit.py @@ -22,9 +22,10 @@ import os import time +from gitbuildsys import msger, errors + from gbp.rpm.git import GitRepositoryError, RpmGitRepository -import msger -import errors + def do(opts, args): diff --git a/gitbuildsys/conf.py b/gitbuildsys/conf.py index 8ce768b..8d10970 100644 --- a/gitbuildsys/conf.py +++ b/gitbuildsys/conf.py @@ -24,8 +24,7 @@ from ConfigParser import SafeConfigParser, DEFAULTSECT, ParsingError, \ NoSectionError, NoOptionError, \ MissingSectionHeaderError -import msger -import errors +from gitbuildsys import msger, errors class BrainConfigParser(SafeConfigParser): """Standard ConfigParser derived class which can reserve most of the diff --git a/gitbuildsys/oscapi.py b/gitbuildsys/oscapi.py index 8fe04de..90b6838 100644 --- a/gitbuildsys/oscapi.py +++ b/gitbuildsys/oscapi.py @@ -30,9 +30,8 @@ import ssl from collections import defaultdict from urllib import quote_plus, pathname2url -import msger -import errors -from utils import hexdigest +from gitbuildsys import msger, errors +from gitbuildsys.utils import hexdigest from osc import conf, core diff --git a/gitbuildsys/runner.py b/gitbuildsys/runner.py index fd8082e..369e7f4 100644 --- a/gitbuildsys/runner.py +++ b/gitbuildsys/runner.py @@ -19,7 +19,7 @@ import os import subprocess -import msger +from gitbuildsys import msger def runtool(cmdln_or_args, catch=1): """ wrapper for most of the subprocess calls diff --git a/gitbuildsys/utils.py b/gitbuildsys/utils.py index 8ccf2ec..2abb694 100644 --- a/gitbuildsys/utils.py +++ b/gitbuildsys/utils.py @@ -30,11 +30,12 @@ try: except ImportError: import cElementTree as ET -import errors -import msger +from gitbuildsys import errors, msger + from gbp.rpm.git import GitRepositoryError from gbp.errors import GbpError + class Workdir(object): def __init__(self, path): self._newdir = path -- 2.7.4