linting: Linter fixes across the codebase.

Author: m000

src/jj2cli/cli.py

@@ -101,7 +101,7 @@ def render_command(argv):
 
     # Renderer
     renderer = Jinja2TemplateRenderer(os.getcwd(), args.undefined, args.no_compact, j2_env_params=customize.j2_environment_params())
-    customize.j2_environment(renderer._env)
+    customize.j2_environment(renderer._env) # pylint: disable=protected-access
 
     # Filters, Tests
     renderer.register_filters(filters.EXTRA_FILTERS)
@@ -133,6 +133,7 @@ def render():
         return 1
     outstream = getattr(sys.stdout, 'buffer', sys.stdout)
     outstream.write(output)
+    return 0
 
 
 def dependencies():

src/jj2cli/customize.py

@@ -1,13 +1,9 @@
 
-class CustomizationModule(object):
+class CustomizationModule:
     """ The interface for customization functions, defined as module-level functions """
 
     def __init__(self, module=None):
         if module is not None:
-            def howcall(*args):
-                print(args)
-                exit(1)
-
             # Import every module function as a method on ourselves
             for name in self._IMPORTED_METHOD_NAMES:
                 try:

src/jj2cli/filters.py

@@ -5,9 +5,9 @@
 from jinja2 import is_undefined, pass_context
 
 if sys.version_info >= (3,0):
-    from shutil import which
+    from shutil import which      # pylint: disable=import-error
 elif sys.version_info >= (2,5):
-    from shutilwhich import which
+    from shutilwhich import which # pylint: disable=import-error
 else:
     assert False, "Unsupported Python version: %s" % sys.version_info
 
@@ -18,7 +18,7 @@
 else:
     assert False, "Unsupported Python version: %s" % sys.version_info
 
-def docker_link(value, format='{addr}:{port}'):
+def docker_link(value, fmt='{addr}:{port}'):
     """ Given a Docker Link environment variable value, format it into something else.
         XXX: The name of the filter is not very informative. This is actually a partial URI parser.
 
@@ -36,12 +36,12 @@ def docker_link(value, format='{addr}:{port}'):
     }
     ```
 
-    And then uses `format` to format it, where the default format is '{addr}:{port}'.
+    And then uses `fmt` to format it, where the default format is '{addr}:{port}'.
 
     More info here: [Docker Links](https://docs.docker.com/userguide/dockerlinks/)
 
     :param value: Docker link (from an environment variable)
-    :param format: The format to apply. Supported placeholders: `{proto}`, `{addr}`, `{port}`
+    :param fmt: The format to apply. Supported placeholders: `{proto}`, `{addr}`, `{port}`
     :return: Formatted string
     """
     # pass undefined values on down the pipeline
@@ -55,7 +55,7 @@ def docker_link(value, format='{addr}:{port}'):
     d = m.groupdict()
 
     # Format
-    return format.format(**d)
+    return fmt.format(**d)
 
 
 def env(varname, default=None):
@@ -85,37 +85,41 @@ def env(varname, default=None):
 
         Notice that there must be quotes around the environment variable name
     """
-    if default is not None:
-        # With the default, there's never an error
-        return os.getenv(varname, default)
-    else:
+    if default is None:
         # Raise KeyError when not provided
         return os.environ[varname]
 
+    # With the default, there's never an error
+    return os.getenv(varname, default)
+
+
 def align_suffix(text, delim, column=None, spaces_after_delim=1):
     """ Align the suffixes of lines in text, starting from the specified delim.
+
+        Example: XXX
     """
     s=''
 
     if column is None or column == 'auto':
-        column = max(map(lambda l: l.find(delim), text.splitlines()))
+        column = max(map(lambda ln: ln.find(delim), text.splitlines()))
     elif column == 'previous':
         column = align_suffix.column_previous
 
-    for l in map(lambda s: s.split(delim, 1), text.splitlines()):
-        if len(l) < 2:
+    for ln in map(lambda s: s.split(delim, 1), text.splitlines()):
+        if len(ln) < 2:
             # no delimiter occurs
-            s += l[0].rstrip() + os.linesep
-        elif l[0].strip() == '':
+            s += ln[0].rstrip() + os.linesep
+        elif ln[0].strip() == '':
             # no content before delimiter - leave as-is
-            s += l[0] + delim + l[1] + os.linesep
+            s += ln[0] + delim + ln[1] + os.linesep
         else:
             # align
-            s += l[0].rstrip().ljust(column) + delim + spaces_after_delim*' ' + l[1].strip() + os.linesep
+            s += ln[0].rstrip().ljust(column) + delim + spaces_after_delim*' ' + ln[1].strip() + os.linesep
 
     align_suffix.column_previous = column
     return s
 
+
 align_suffix.column_previous = None
 
 
@@ -140,11 +144,13 @@ def sh_opt(text, name, delim=" ", quote=False):
         text = sh_quote(text)
     return '%s%s%s' % (name, delim, text)
 
+
 def sh_optq(text, name, delim=" "):
     """ Quote text and format as a command line option.
     """
     return sh_opt(text, name, delim, quote=True)
 
+
 # Filters to be loaded
 EXTRA_FILTERS = {
     'sh_quote': sh_quote,
@@ -163,4 +169,3 @@ def sh_optq(text, name, delim=" "):
     'align_suffix': align_suffix,
     'ctxlookup': ctxlookup,
 }
-

src/jj2cli/parsers.py

@@ -127,8 +127,7 @@ def parse(self, ignore_missing=False, fallback_format='ini'):
         if isinstance(self._iostr, FileNotFoundError):
             if ignore_missing is True:
                 return {}
-            else:
-                raise self._iostr
+            raise self._iostr
         return getattr(self, '_parse_%s' % fmt)()
 
     def _parse_ENV(self):

src/jj2cli/render.py

@@ -22,6 +22,7 @@ def __init__(self, cwd, encoding='utf-8'):
     def get_source(self, environment, template):
         # Path
         filename = os.path.join(self.cwd, template)
+        logging.debug("TEMPLATE_PATH %s", filename)
 
         # Read
         try:
@@ -35,7 +36,7 @@ def get_source(self, environment, template):
         return contents, filename, uptodate
 
 
-class Jinja2TemplateRenderer(object):
+class Jinja2TemplateRenderer:
     """ Template renderer """
 
     UNDEFINED = {
@@ -44,8 +45,9 @@ class Jinja2TemplateRenderer(object):
         'debug': jinja2.DebugUndefined,   # return the debug info when printed
     }
 
-    def __init__(self, cwd, undefined='strict', no_compact=False, j2_env_params={}):
+    def __init__(self, cwd, undefined='strict', no_compact=False, j2_env_params=None):
         # Custom env params
+        j2_env_params = j2_env_params if j2_env_params is not None else {}
         j2_env_params.setdefault('keep_trailing_newline', True)
         j2_env_params.setdefault('undefined', self.UNDEFINED[undefined])
         j2_env_params.setdefault('trim_blocks', not no_compact)

tests/resources/customize.py

@@ -37,7 +37,7 @@ def j2_environment(env):
     :rtype: jinja2.environment.Environment
     """
     env.globals.update(
-        my_function=lambda v: 'my function says "{}"'.format(v)
+        my_function='my function says "{}"'.format
     )
     return env
 
@@ -67,7 +67,7 @@ def extra_tests():
     """
     return dict(
         # Example: {% if a|int is custom_odd %}odd{% endif %}
-        custom_odd=lambda n: True if (n % 2) else False
+        custom_odd=lambda n: bool(n % 2)
     )
 
 # {% endraw %}