formatting

Author: erral

mrbob/cli.py

@@ -1,18 +1,16 @@
 """Command line interface to mr.bob"""
 
+import argparse
 import importlib.metadata
-import sys
 import os
 import shutil
+import sys
 
 import six
-import argparse
 
-from .configurator import Configurator
-from .configurator import maybe_bool
-from .bobexceptions import ConfigurationError
-from .bobexceptions import TemplateConfigurationError
-from .parsing import parse_config, update_config, pretty_format_config
+from .bobexceptions import ConfigurationError, TemplateConfigurationError
+from .configurator import Configurator, maybe_bool
+from .parsing import parse_config, pretty_format_config, update_config
 
 # http://docs.python.org/library/argparse.html
 parser = argparse.ArgumentParser(description="Filesystem template renderer")

mrbob/configurator.py

@@ -2,35 +2,37 @@
 
 import os
 import re
-import sys
 import readline
-
-try:  # pragma: no cover
-    from urllib import urlretrieve  # NOQA
-except ImportError:  # pragma: no cover
-    # PY3K
-    from urllib.request import urlretrieve  # NOQA
-import tempfile
-from zipfile import ZipFile, is_zipfile
-
-readline  # NOQA: make pyflakes happy, readline makes interactive mode keep history
+import sys
+from importlib import import_module
 
 import six
-from importlib import import_module
 
-from .rendering import render_structure
-from .parsing import (
-    parse_config,
-    write_config,
-    update_config,
-    pretty_format_config,
-)
 from .bobexceptions import (
     ConfigurationError,
-    TemplateConfigurationError,
     SkipQuestion,
+    TemplateConfigurationError,
     ValidationError,
 )
+from .parsing import (
+    parse_config,
+    pretty_format_config,
+    update_config,
+    write_config,
+)
+from .rendering import render_structure
+
+try:  # pragma: no cover
+    from urllib import urlretrieve  # noqa
+except ImportError:  # pragma: no cover
+    # PY3K
+    from urllib.request import urlretrieve  # noqa
+import tempfile
+from zipfile import ZipFile, is_zipfile
+
+# make pyflakes happy, readline makes interactive mode keep history
+readline  # noqa
+
 
 DOTTED_REGEX = re.compile(r"^[a-zA-Z_.]+:[a-zA-Z_.]+$")
 
@@ -286,7 +288,7 @@ def __init__(
         pre_ask_question="",
         post_ask_question="",
         help="",
-        **extra
+        **extra,
     ):
         self.name = name
         self.question = question

mrbob/parsing.py

@@ -1,19 +1,20 @@
+import collections
 import os
 import tempfile
-import collections
 
 try:  # pragma: no cover
-    from collections import OrderedDict  # NOQA
+    from collections import OrderedDict  # noqa
 except ImportError:  # pragma: no cover
-    from ordereddict import OrderedDict  # NOQA
-import six
+    from ordereddict import OrderedDict  # noqa
 import configparser
 
+import six
+
 try:  # pragma: no cover
-    from urllib import urlretrieve  # NOQA
+    from urllib import urlretrieve  # noqa
 except ImportError:  # pragma: no cover
     # PY3K
-    from urllib.request import urlretrieve  # NOQA
+    from urllib.request import urlretrieve  # noqa
 
 from .bobexceptions import ConfigurationError
 
@@ -109,7 +110,7 @@ def update_config(first_config, second_config):
 
 
 def pretty_format_config(config):
-    l = []
+    item_list = []
 
     def format_config(dict_, namespace=""):
         for key, value in dict_.items():
@@ -120,8 +121,8 @@ def format_config(dict_, namespace=""):
             if isinstance(value, dict):
                 format_config(value, namespace=namespace_new)
             else:
-                l.append("%s = %s" % (namespace_new, value))
+                item_list.append("%s = %s" % (namespace_new, value))
 
     format_config(config)
 
-    return sorted(l)
+    return sorted(item_list)

mrbob/rendering.py

@@ -1,12 +1,12 @@
-from os import path
-from shutil import copy2
 import codecs
 import fnmatch
 import os
 import re
-import six
 import stat
+from os import path
+from shutil import copy2
 
+import six
 from jinja2 import Environment, StrictUndefined
 
 jinja2_env = Environment(

mrbob/tests/test_cli.py

@@ -1,9 +1,9 @@
-import unittest
-import tempfile
+import importlib.metadata
 import os
 import shutil
+import tempfile
+import unittest
 from unittest import mock
-import importlib.metadata
 
 
 class TestCLI(unittest.TestCase):

mrbob/tests/test_configurator.py

@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 
-import unittest
 import os
+import shutil
 import sys
 import tempfile
-import shutil
-import six
+import unittest
 from unittest import mock
 
+import six
+
 mocked_pre_ask_question = mock.Mock()
 mocked_post_ask_question = mock.Mock()
 mocked_post_ask_question_validationerror = mock.Mock()

mrbob/tests/test_hooks.py

@@ -1,6 +1,5 @@
-from unittest import TestCase
-from unittest import mock
 import time
+from unittest import TestCase, mock
 
 from ..configurator import Question
 from .test_configurator import DummyConfigurator

mrbob/tests/test_parsing.py

@@ -1,19 +1,18 @@
 # -*- coding: utf-8 -*-
+import codecs
 import os
-import unittest
 import tempfile
-import codecs
-from collections import OrderedDict  # NOQA
+import unittest
+from collections import OrderedDict  # noqa
+from unittest import mock
 
 import six
 
-from unittest import mock
-
 
 class parse_configTest(unittest.TestCase):
-
     def call_FUT(self, configname="example.ini"):
         import mrbob
+
         from ..parsing import parse_config
 
         if not configname.startswith("http"):
@@ -104,7 +103,7 @@ def test_parse_remote_config(self, urlretrieve):
 
         def write(url, filename):
             f = open(filename, "w")
-            f.write("[variables]\n" "foo = bar\n")
+            f.write("[variables]\nfoo = bar\n")
             f.close()
 
         urlretrieve.side_effect = write
@@ -114,7 +113,6 @@ def write(url, filename):
 
 
 class update_configTest(unittest.TestCase):
-
     def call_FUT(self, config, newconfig):
         from ..parsing import update_config
 
@@ -160,7 +158,6 @@ def test_update_config_override_nested(self):
 
 
 class write_configTest(unittest.TestCase):
-
     def setUp(self):
         self.tmpfile = tempfile.mkstemp()[1]
 
@@ -218,7 +215,6 @@ def test_non_str(self):
 
 
 class pretty_format_configTest(unittest.TestCase):
-
     def call_FUT(self, config):
         from ..parsing import pretty_format_config
 
@@ -240,7 +236,6 @@ def test_complex(self):
 
 
 class nest_variablesTest(unittest.TestCase):
-
     def call_FUT(self, d):
         from ..parsing import nest_variables
 

mrbob/tests/test_rendering.py

@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
 
-from shutil import rmtree
-from tempfile import mkdtemp
 import codecs
 import os
 import stat
 import unittest
-
+from shutil import rmtree
+from tempfile import mkdtemp
 from unittest import mock
+
 import six
 
 
@@ -33,8 +33,7 @@ def call_FUT(
         ignored_files=[],
         ignored_directories=[],
     ):
-        from ..rendering import render_structure
-        from ..rendering import jinja2_renderer
+        from ..rendering import jinja2_renderer, render_structure
 
         if output_dir is None:
             output_dir = self.fs_tempdir
@@ -218,8 +217,7 @@ def tearDown(self):
     def call_FUT(
         self, template, variables, output_dir=None, verbose=False, renderer=None
     ):
-        from ..rendering import render_template
-        from ..rendering import python_formatting_renderer
+        from ..rendering import python_formatting_renderer, render_template
 
         if output_dir is None:
             output_dir = self.fs_tempdir
@@ -311,6 +309,7 @@ def test_render_namespace_missing_key(self):
 
     def test_render_namespace_missing_key_jinja2(self):
         from jinja2 import UndefinedError
+
         from ..rendering import jinja2_renderer
 
         t = os.path.join(self.fs_templates, "missing_namespace_key/foo_jinja2.bob")
@@ -321,6 +320,7 @@ def test_render_namespace_missing_key_jinja2(self):
 
     def test_jinja2_strict_undefined(self):
         from jinja2 import UndefinedError
+
         from ..rendering import jinja2_renderer
 
         t = os.path.join(self.fs_templates, "strict_undefined.bob")