Merge pull request p12tic#94 from p12tic/fix-warnings

Fix new pylint warnings

build_link_map.py

@@ -21,8 +21,9 @@
 # filename -> title mapping to a xml file.
 
 import fnmatch
-import re
 import os
+import re
+
 from link_map import LinkMap
 
 

commands/preprocess.py

@@ -19,10 +19,11 @@
 
 import fnmatch
 import io
-import re
 import os
+import re
 import shutil
 import urllib.parse
+
 from lxml import etree
 
 

commands/preprocess_cssless.py

@@ -21,10 +21,11 @@
 import logging
 import os
 import warnings
-from premailer import Premailer
+
 import cssutils
 from lxml import etree
 from lxml.etree import strip_elements
+from premailer import Premailer
 
 
 def preprocess_html_merge_cssless(src_path, dst_path):

ddg_parse_html.py

@@ -20,6 +20,7 @@
 
 import re
 from copy import deepcopy
+
 import lxml.etree as e
 
 
@@ -34,8 +35,8 @@ def get_content_el(root_el):
                             /div[@id="content"]
                             /div[@id="bodyContent"]
                             /div[@class="mw-content-ltr"]''')[0]
-    except Exception:
-        raise DdgException("Could not find content element")
+    except Exception as e:
+        raise DdgException("Could not find content element") from e
 
 
 VERSION_C89 = 0

devhelp2qch.py

@@ -19,7 +19,9 @@
 
 
 import argparse
+
 from lxml import etree
+
 from index_transform.devhelp_qch import convert_devhelp_to_qch
 
 

export.py

@@ -19,9 +19,9 @@
 '''
 
 import argparse
+import json
 import urllib.parse
 import urllib.request
-import json
 
 
 def retrieve_page_names(root, ns_index):

fix_devhelp-links.py

@@ -19,9 +19,10 @@
 '''
 
 import sys
+
 import lxml.etree as e
-from link_map import LinkMap
 
+from link_map import LinkMap
 
 if len(sys.argv) != 3:
     print('''Please provide the following 2 argument:

gadgets/replace_tests_base.py

@@ -24,6 +24,7 @@
 import re
 import sys
 
+
 def get_html_files(root):
     files = []
     for dir, dirnames, filenames in os.walk(root):

gadgets/standard_revisions_tests/base.py

@@ -18,6 +18,7 @@
 '''
 
 import unittest
+
 from selenium import webdriver
 from selenium.webdriver.support.ui import Select
 

gadgets/sync_tests_mwiki.py

@@ -29,17 +29,17 @@
 # command line.
 os.environ['PYWIKIBOT2_NO_USER_CONFIG']='1'
 
-import pywikibot
-import pywikibot.config2
-import pywikibot.pagegenerators
-import pywikibot.data.api
-
 import argparse
 import itertools
 import shutil
 import sys
 import urllib
 
+import pywikibot
+import pywikibot.config2
+import pywikibot.data.api
+import pywikibot.pagegenerators
+
 SYNC_DIRECTION_UPLOAD = 1
 SYNC_DIRECTION_DOWNLOAD = 2
 

images/math-atan2.py

@@ -17,14 +17,14 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
+import math
+import os
+import pprint
+
 import matplotlib.cm as cm
 import matplotlib.colors as colors
 import matplotlib.pyplot as plt
-
-import os
 import numpy as np
-import math
-import pprint
 
 font = {'family' : 'DejaVu Sans',
         'weight' : 'normal',

images/math.py

@@ -16,11 +16,12 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
-import matplotlib.pyplot as plt
 import os
-from numpy import *
 from bisect import *
 
+import matplotlib.pyplot as plt
+from numpy import *
+
 #
 # DATA - array of items describing data to plot
 # Each item consists of the following parts

index2autolinker.py

@@ -20,6 +20,7 @@
 
 import argparse
 import json
+
 from index_transform.autolinker import Index2AutolinkerGroups
 from index_transform.autolinker import Index2AutolinkerLinks
 

index2browser.py

@@ -19,6 +19,7 @@
 '''
 
 import argparse
+
 from index_transform.browser import Index2Browser
 
 

index2ddg.py

@@ -21,15 +21,17 @@
 import argparse
 import fnmatch
 import os
-import sys
 import re
+import sys
 
 import lxml.etree as e
 from lxml import html
 
-from index_transform.common import IndexTransform
 from build_link_map import build_link_map
-from ddg_parse_html import get_declarations, get_short_description, DdgException
+from ddg_parse_html import DdgException
+from ddg_parse_html import get_declarations
+from ddg_parse_html import get_short_description
+from index_transform.common import IndexTransform
 
 # Entry types
 # a class or struct
@@ -129,7 +131,7 @@ class Index2DuckDuckGoList(IndexTransform):
 
     def __init__(self, ident_map):
         self.ident_map = ident_map
-        super(Index2DuckDuckGoList, self).__init__(ignore_typedefs=True)
+        super().__init__(ignore_typedefs=True)
 
     def process_item_hook(self, el, full_name, full_link):
 

index2devhelp.py

@@ -19,6 +19,7 @@
 '''
 
 import argparse
+
 from index_transform.devhelp import transform_devhelp
 
 

index2doxygen-tag.py

@@ -19,11 +19,13 @@
 '''
 
 import argparse
+
 from lxml import etree
-from link_map import LinkMap
+
 from index_transform.doxygen_tag import Index2DoxygenTag
 from index_transform.doxygen_tag import Item
 from index_transform.doxygen_tag import print_map
+from link_map import LinkMap
 
 
 def main():

index2highlight.py

@@ -19,6 +19,7 @@
 '''
 
 import argparse
+
 from index_transform.highlight import Index2Highlight
 
 

index2search.py

@@ -19,6 +19,7 @@
 '''
 
 import argparse
+
 from index_transform.search import Index2Search
 
 

index_transform/autolinker.py

@@ -75,7 +75,7 @@ def process_item_hook(self, el, full_name, full_link):
 class Index2AutolinkerLinks(IndexTransform):
 
     def __init__(self):
-        super(Index2AutolinkerLinks, self).__init__()
+        super().__init__()
         self.links = []
         self.curr_group = None
 

index_transform/common.py

@@ -20,7 +20,6 @@
 
 import lxml.etree as e
 
-
 '''
     This is a python script for various transformations of the index.
 

index_transform/devhelp.py

@@ -19,6 +19,7 @@
 '''
 
 from lxml import etree
+
 from index_transform.common import IndexTransform
 
 

index_transform/doxygen_tag.py

@@ -19,6 +19,7 @@
 '''
 
 from functools import total_ordering
+
 from index_transform.common import IndexTransform
 from xml_utils import xml_escape
 

misc/fontforge-gen.python

@@ -18,11 +18,12 @@
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
 
-import fontforge
 import os
-import psMat
 import sys
 
+import fontforge
+import psMat
+
 inputFont = sys.argv[1]
 outputFont = os.path.splitext(inputFont)[0] + "Condensed80.otf"
 

preprocess.py

@@ -21,6 +21,7 @@
 import concurrent.futures
 import os
 import shutil
+
 from commands import preprocess
 
 

preprocess_qch.py

@@ -21,6 +21,7 @@
 import concurrent.futures
 import os
 import shutil
+
 from commands import preprocess_cssless
 
 

requirements-ci.txt

@@ -1,2 +1,2 @@
-pylint
-flake8
+pylint==2.6.0
+flake8==3.8.4

requirements.txt

@@ -1,2 +1,2 @@
-premailer
-lxml
+premailer==3.7.0
+lxml==4.5.2

tests/test_devhelp.py

@@ -17,6 +17,7 @@
 
 import os
 import unittest
+
 from index_transform.devhelp import transform_devhelp
 
 

tests/test_devhelp_qch.py

@@ -17,7 +17,9 @@
 
 import os
 import unittest
+
 from lxml import etree
+
 from index_transform.devhelp_qch import convert_devhelp_to_qch
 
 

tests/test_preprocess.py

@@ -18,27 +18,29 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see http://www.gnu.org/licenses/.
 
+import contextlib
 import io
 import os
 import sys
-import contextlib
 import unittest
 import unittest.mock
+
 from lxml import etree
+
 from commands.preprocess import build_rename_map
 from commands.preprocess import convert_loader_name
 from commands.preprocess import has_class
 from commands.preprocess import is_external_link
 from commands.preprocess import is_ranges_placeholder
-from commands.preprocess import remove_noprint
-from commands.preprocess import remove_see_also
-from commands.preprocess import remove_google_analytics
 from commands.preprocess import remove_ads
 from commands.preprocess import remove_fileinfo
+from commands.preprocess import remove_google_analytics
+from commands.preprocess import remove_noprint
+from commands.preprocess import remove_see_also
 from commands.preprocess import remove_unused_external
+from commands.preprocess import rename_files
 from commands.preprocess import transform_ranges_placeholder
 from commands.preprocess import trasform_relative_link
-from commands.preprocess import rename_files
 
 
 class DummyFile(object):

tests/test_preprocess_cssless.py

@@ -17,16 +17,18 @@
 
 import os
 import unittest
+
 from lxml import etree
-from commands.preprocess_cssless import preprocess_html_merge_cssless
-from commands.preprocess_cssless import silence_cssutils_warnings
-from commands.preprocess_cssless import convert_span_tables_to_tr_td
-from commands.preprocess_cssless import convert_inline_block_elements_to_table
-from commands.preprocess_cssless import convert_zero_td_width_to_nonzero
+
 from commands.preprocess_cssless import apply_font_size
 from commands.preprocess_cssless import convert_font_size_property_to_pt
-from commands.preprocess_cssless \
-    import convert_table_border_top_to_tr_background
+from commands.preprocess_cssless import convert_inline_block_elements_to_table
+from commands.preprocess_cssless import convert_span_tables_to_tr_td
+from commands.preprocess_cssless import \
+    convert_table_border_top_to_tr_background
+from commands.preprocess_cssless import convert_zero_td_width_to_nonzero
+from commands.preprocess_cssless import preprocess_html_merge_cssless
+from commands.preprocess_cssless import silence_cssutils_warnings
 
 
 class TestPreprocessHtmlMergeCss(unittest.TestCase):