fix code stylecleanup

13 files changed, 26 insertions, 34 deletions

diff --git a/creole/__init__.py b/creole/__init__.py
index 398cdc1..25dd09c 100644
--- a/creole/__init__.py
+++ b/creole/__init__.py
@@ -28,7 +28,7 @@ from creole.emitter.html2textile_emitter import TextileEmitter
 from creole.parser.creol2html_parser import CreoleParser
 from creole.parser.html_parser import HtmlParser
 
-__version__ = "1.4.0"
+__version__ = "1.4.1"
 __api__ = "1.0"  # Creole 1.0 spec - http://wikicreole.org/
 
 VERSION_STRING = __version__  # remove in future
diff --git a/creole/emitter/creol2html_emitter.py b/creole/emitter/creol2html_emitter.py
index e9c9091..f946c88 100644
--- a/creole/emitter/creol2html_emitter.py
+++ b/creole/emitter/creol2html_emitter.py
@@ -52,9 +52,9 @@ class TableOfContent(object):
 
             if index > stack_length:
                 for _ in range(stack_length, index):
-                    l = []
-                    stack[-1].append(l)
-                    stack.append(l)
+                    nest_list = []
+                    stack[-1].append(nest_list)
+                    stack.append(nest_list)
             elif index < stack_length:
                 stack = stack[:index]
 
@@ -293,7 +293,7 @@ class HtmlEmitter(object):
         args = node.macro_args
         try:
             macro_kwargs = string2dict(args)
-        except ValueError as e:
+        except ValueError:
             exc_info = sys.exc_info()
             return self.error(
                 f"Wrong macro arguments: {json.dumps(args)} for macro '{macro_name}' (maybe wrong macro tag syntax?)",
@@ -306,12 +306,12 @@ class HtmlEmitter(object):
         if isinstance(self.macros, dict):
             try:
                 macro = self.macros[macro_name]
-            except KeyError as e:
+            except KeyError:
                 exc_info = sys.exc_info()
         else:
             try:
                 macro = getattr(self.macros, macro_name)
-            except AttributeError as e:
+            except AttributeError:
                 exc_info = sys.exc_info()
 
         if macro is None:
diff --git a/creole/parser/creol2html_parser.py b/creole/parser/creol2html_parser.py
index 19f85c7..ff440e2 100644
--- a/creole/parser/creol2html_parser.py
+++ b/creole/parser/creol2html_parser.py
@@ -266,10 +266,14 @@ class CreoleParser(object):
         level = len(bullet) - 1
         lst = self.cur
         # Find a list of the same kind and level up the tree
-        while (lst and
-               not (lst.kind in ('number_list', 'bullet_list') and
-                    lst.level == level) and
-               lst.kind not in ('document', 'section', 'blockquote')):
+        while (
+            lst and not (
+                lst.kind in (
+                    'number_list',
+                    'bullet_list') and lst.level == level) and lst.kind not in (
+                'document',
+                'section',
+                'blockquote')):
             lst = lst.parent
         if lst and lst.kind == kind:
             self.cur = lst
diff --git a/creole/parser/creol2html_rules.py b/creole/parser/creol2html_rules.py
index 01faeb7..cbe0451 100644
--- a/creole/parser/creol2html_rules.py
+++ b/creole/parser/creol2html_rules.py
@@ -234,7 +234,7 @@ def _verify_rules(rules, flags):
             # Try to merge the rules. e.g. Check if group named double used.
             rule_list.append(rule)
             re.compile('|'.join(rule_list), flags)
-        except Exception as err:
+        except Exception:
             print(" *** Error with rule:")
             print(rule)
             print(" -" * 39)
diff --git a/creole/rest_tools/clean_writer.py b/creole/rest_tools/clean_writer.py
index c9b9923..3798c50 100644
--- a/creole/rest_tools/clean_writer.py
+++ b/creole/rest_tools/clean_writer.py
@@ -124,9 +124,9 @@ class CleanHTMLTranslator(html4css1.HTMLTranslator, object):
 
     # set only html_body, we used in rest2html() and don't surround it with <div>
     def depart_document(self, node):
-        self.html_body.extend(self.body_prefix[1:] + self.body_pre_docinfo
-                              + self.docinfo + self.body
-                              + self.body_suffix[:-1])
+        self.html_body.extend(
+            self.body_prefix[1:] + self.body_pre_docinfo + self.docinfo + self.body + self.body_suffix[:-1]
+        )
         assert not self.context, 'len(context) = %s' % len(self.context)
 
     # __________________________________________________________________________
diff --git a/creole/rest_tools/pypi_rest2html.py b/creole/rest_tools/pypi_rest2html.py
index 4f86640..b264514 100644
--- a/creole/rest_tools/pypi_rest2html.py
+++ b/creole/rest_tools/pypi_rest2html.py
@@ -12,21 +12,15 @@
 """
 
 
-try:
-    # Python 3
-    from urllib.parse import urlparse
-except ImportError:
-    # Python 2
-    from urlparse import urlparse
+from urllib.parse import urlparse
 
 from creole.exceptions import DocutilsImportError
 
 try:
-    import docutils
+    import docutils  # noqa flake8
     from docutils import io, readers
     from docutils.core import publish_doctree, Publisher
-    from docutils.writers import get_writer_class
-    from docutils.transforms import TransformError, Transform
+    from docutils.transforms import TransformError
 except ImportError as err:
     msg = (
         "%s - You can't use rest2html!"
diff --git a/creole/shared/base_emitter.py b/creole/shared/base_emitter.py
index b7467e4..d0c98f1 100644
--- a/creole/shared/base_emitter.py
+++ b/creole/shared/base_emitter.py
@@ -56,7 +56,7 @@ class BaseEmitter(object):
 
         try:
             return self.deentity.replace_named(entity)
-        except KeyError as err:
+        except KeyError:
             if self.debugging:
                 print(f"unknown html entity found: {entity!r}")
             return f"&{entity}"  # FIXME
diff --git a/creole/tests/test_cli.py b/creole/tests/test_cli.py
index e03a53c..cae1e40 100644
--- a/creole/tests/test_cli.py
+++ b/creole/tests/test_cli.py
@@ -10,8 +10,6 @@
 """
 
 
-import os
-import subprocess
 import sys
 import tempfile
 import unittest
diff --git a/creole/tests/test_creole2html.py b/creole/tests/test_creole2html.py
index 02c0762..6f60491 100644
--- a/creole/tests/test_creole2html.py
+++ b/creole/tests/test_creole2html.py
@@ -26,7 +26,7 @@ from creole.tests import test_macros
 from creole.tests.utils.base_unittest import BaseCreoleTest
 
 try:
-    from pygments import highlight
+    import pygments  # noqa flake8
     PYGMENTS = True
 except ImportError:
     PYGMENTS = False
diff --git a/creole/tests/test_cross_compare_all.py b/creole/tests/test_cross_compare_all.py
index 2d8e97d..c069fa9 100644
--- a/creole/tests/test_cross_compare_all.py
+++ b/creole/tests/test_cross_compare_all.py
@@ -372,7 +372,6 @@ class CrossCompareTests(BaseCreoleTest):
 #            """
 #        )
 
-
     def test_pre1(self):
         self.cross_compare(
             creole_string=r"""
@@ -445,7 +444,6 @@ class CrossCompareTests(BaseCreoleTest):
 #                <p>end</p>
 #            """)
 
-
     def test_pre_contains_braces(self):
         self.cross_compare(
             creole_string="""
diff --git a/creole/tests/test_setup_utils.py b/creole/tests/test_setup_utils.py
index 8e8e32a..33d998c 100644
--- a/creole/tests/test_setup_utils.py
+++ b/creole/tests/test_setup_utils.py
@@ -12,7 +12,6 @@
 
 import os
 import tempfile
-import unittest
 import warnings
 
 import creole
@@ -20,7 +19,7 @@ from creole.setup_utils import get_long_description
 from creole.tests.utils.base_unittest import BaseCreoleTest
 
 try:
-    import docutils
+    import docutils  # noqa flake8
     DOCUTILS = True
 except ImportError:
     DOCUTILS = False
diff --git a/creole/tests/test_subprocess.py b/creole/tests/test_subprocess.py
index fcce3bc..4a8b02e 100644
--- a/creole/tests/test_subprocess.py
+++ b/creole/tests/test_subprocess.py
@@ -9,7 +9,6 @@
 """
 
 
-import os
 import sys
 import unittest
 
diff --git a/pyproject.toml b/pyproject.toml
index 56386ae..b821124 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = 'python-creole'
-version = '1.4.0'
+version = '1.4.1'
 description = 'python-creole is an open-source (GPL) markup converter in pure Python for: creole2html, html2creole, html2ReSt, html2textile'
 
 # TODO: convert it: