Make the linter happy

diff --git a/lib/dpx_puppettools/app/__init__.py b/lib/dpx_puppettools/app/__init__.py
index 31a44dc3d65a0e294222bd158ab0a6a1a252730d..6cea040686dc3b3bde380cf8df8b250a9e9cf0b8 100644 (file)
--- a/lib/dpx_puppettools/app/__init__.py
+++ b/lib/dpx_puppettools/app/__init__.py
@@ -33,9 +33,9 @@ from fb_tools.argparse_actions import DirectoryOptionAction
 
 # Own modules
 from .. import __version__ as GLOBAL_VERSION
-from .. import DEFAULT_CONFIG_DIR
+from .. import DEFAULT_CONFIG_DIR, MAX_PORT_NUMBER
 from .. import DEFAULT_TERMINAL_WIDTH, DEFAULT_TERMINAL_HEIGHT
-from .. import pp
+from .. import pp, print_out
 
 from ..xlate import XLATOR
 
@@ -48,7 +48,7 @@ LOG = logging.getLogger(__name__)
 _ = XLATOR.gettext
 ngettext = XLATOR.ngettext
 
-__version__ = '0.4.2'
+__version__ = '0.4.3'
 
 
 # =============================================================================
@@ -167,7 +167,7 @@ class BaseDPXPuppetApplication(FbConfigApplication):
 
         help_txt = _(
             "The directory containing the checked out r10k directories. Default: {!r}.").format(
-             DpxPuppetConfig.default_env_root_dir)
+                DpxPuppetConfig.default_env_root_dir)
         puppet_group.add_argument(
             '--env-root-dir', dest='env_root_dir', metavar=_('DIRECTORY'),
             action=DirectoryOptionAction, must_exists=True, help=help_txt,

diff --git a/lib/dpx_puppettools/app/get_forge_module.py b/lib/dpx_puppettools/app/get_forge_module.py
index 0cd108c5cb5202c619385fc304800967cd482705..8bdcc7553c58dc04df56b6a5479be40d8af05f84 100644 (file)
--- a/lib/dpx_puppettools/app/get_forge_module.py
+++ b/lib/dpx_puppettools/app/get_forge_module.py
@@ -11,12 +11,10 @@ from __future__ import absolute_import
 import logging
 import os
 
-from pathlib import Path
-
 # Third party modules
 
 # Own modules
-from .. import pp, DEFAULT_VAR_DIR
+from .. import pp
 
 from ..xlate import XLATOR
 
@@ -33,7 +31,7 @@ LOG = logging.getLogger(__name__)
 _ = XLATOR.gettext
 ngettext = XLATOR.ngettext
 
-__version__ = '0.7.1'
+__version__ = '0.7.2'
 
 
 # =============================================================================
@@ -233,7 +231,7 @@ class GetForgeModuleApplication(BaseDPXPuppetApplication):
         if self.module_name not in pfile:
             if self.verbose > 1:
                 msg = _("Module {m!r} not found in Puppetfile of environment {e!r}.").format(
-                        m=self.module_name, e=env)
+                    m=self.module_name, e=env)
                 LOG.debug(msg)
             return
 
@@ -289,7 +287,6 @@ class GetForgeModuleApplication(BaseDPXPuppetApplication):
         self.empty_line()
 
 
-
 # =============================================================================
 
 if __name__ == "__main__":

diff --git a/lib/dpx_puppettools/base_moduleinfo.py b/lib/dpx_puppettools/base_moduleinfo.py
index 18d8dd6ef11987aed80ae8b69b871281fd3e280f..30c0819b47f9022533792a116dfa7491699484d1 100644 (file)
--- a/lib/dpx_puppettools/base_moduleinfo.py
+++ b/lib/dpx_puppettools/base_moduleinfo.py
@@ -14,13 +14,13 @@ import re
 
 # Third party modules
 from fb_tools.common import to_str
-from fb_tools.obj import FbBaseObjectError, FbBaseObject
+from fb_tools.obj import FbBaseObject
 
 # Own modules
-from .errors import PuppetToolsError, ModuleInitError
+from .errors import ModuleInitError, BaseModuleInfoError
 from .xlate import XLATOR
 
-__version__ = '0.2.0'
+__version__ = '0.2.1'
 
 LOG = logging.getLogger(__name__)
 

diff --git a/lib/dpx_puppettools/config.py b/lib/dpx_puppettools/config.py
index 85b60a60addf46820d0c0133196ad83ced8e06e5..2844aa59e48ac7615f499606005b6e5e5cb726fe 100644 (file)
--- a/lib/dpx_puppettools/config.py
+++ b/lib/dpx_puppettools/config.py
@@ -31,12 +31,12 @@ from fb_tools import MailAddress
 from . import __version__ as GLOBAL_VERSION
 from . import pp, DEFAULT_MAIL_RECIPIENTS, DEFAULT_REPLY_TO, DEFAULT_MAIL_SERVER
 from . import DEFAULT_LOG_DIR, DEFAULT_VAR_DIR, DEFAULT_DEPLOY_ROOT_DIR
-from . import DEFAULT_ENVIRONMENTS_ROOT_DIR
+from . import DEFAULT_ENVIRONMENTS_ROOT_DIR, MAX_PORT_NUMBER
 from .errors import PuppetToolsError
 from .xlate import XLATOR
 
 CONFIG_DIR = 'pixelpark'
-__version__ = '0.3.3'
+__version__ = '0.3.4'
 LOG = logging.getLogger(__name__)
 VALID_MAIL_METHODS = ('smtp', 'sendmail')
 DEFAULT_DOMAIN = 'pixelpark.com'
@@ -221,7 +221,8 @@ class DpxPuppetConfig(BaseMultiConfig):
 
         config = self.cfg[section_name]
         if self.verbose > 2:
-            LOG.debug(_("Evaluating config section {!r}:").format(section_name) + '\n' + pp(config))
+            LOG.debug(_(
+                "Evaluating config section {!r}:").format(section_name) + '\n' + pp(config))
 
         re_log_dir = re.compile(r'^\s*log(?:ging)?[_-]*dir\s*$', re.IGNORECASE)
         re_var_dir = re.compile(r'^\s*var[_-]*dir\s*$', re.IGNORECASE)

diff --git a/lib/dpx_puppettools/forge/cur_mod_release_info.py b/lib/dpx_puppettools/forge/cur_mod_release_info.py
index beae3ae977c84ab6d4a53400e94288205c9b24de..1dca40cca545d2b1036914661d273327e6b5bbac 100644 (file)
--- a/lib/dpx_puppettools/forge/cur_mod_release_info.py
+++ b/lib/dpx_puppettools/forge/cur_mod_release_info.py
@@ -32,7 +32,7 @@ from .mod_release_info import ModuleReleaseInfo
 
 from .base_module_info import BaseForgeModuleInfo
 
-__version__ = '0.3.0'
+__version__ = '0.3.1'
 
 LOG = logging.getLogger(__name__)
 
@@ -441,8 +441,8 @@ class CurrentModuleReleaseInfo(ModuleReleaseInfo):
         if 'tasks' in data and data['tasks']:
             if self.verbose > 3:
                 LOG.debug(
-                    "Tasks in current release of {!r}:".format(self.slug) +
-                    '\n' + pp(data['tasks']))
+                    "Tasks in current release of {!r}:".format(
+                        self.slug) + '\n' + pp(data['tasks']))
             for task in data['tasks']:
                 self.tasks.append(copy.copy(task))