From 1aa13f217381cc6661d03e80cce4711c8b65a2a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 13 Jul 2018 11:29:25 +0200
Subject: [PATCH] More flake8 happyness

---
 rpmlint/AbstractCheck.py | 3 ++-
 rpmlint/Config.py        | 2 --
 rpmlint/Filter.py        | 1 -
 rpmlint/LSBCheck.py      | 1 -
 rpmlint/MenuXDGCheck.py  | 2 +-
 scripts/lint.py          | 6 ++++--
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/rpmlint/AbstractCheck.py b/rpmlint/AbstractCheck.py
index 7e41e4b1..46894d22 100644
--- a/rpmlint/AbstractCheck.py
+++ b/rpmlint/AbstractCheck.py
@@ -11,6 +11,7 @@ import contextlib
 import re
 import urllib.request
 
+from rpmlint import __version__
 from rpmlint import Config
 from rpmlint.Filter import addDetails, printInfo, printWarning
 
@@ -74,7 +75,7 @@ class AbstractCheck(object):
         try:
             opener = urllib.request.build_opener(_HeadRedirectHandler())
             opener.addheaders = [('User-Agent',
-                                  'rpmlint/%s' % Config.__version__)]
+                                  'rpmlint/%s' % __version__)]
             res = opener.open(_HeadRequest(url), timeout=self.network_timeout)
         except Exception as e:
             errstr = str(e) or repr(e) or type(e)
diff --git a/rpmlint/Config.py b/rpmlint/Config.py
index f060e9b6..6f106b4b 100644
--- a/rpmlint/Config.py
+++ b/rpmlint/Config.py
@@ -11,8 +11,6 @@ import locale
 import os.path
 import re
 
-from rpmlint import __version__
-
 DEFAULT_CHECKS = ("DistributionCheck",
                   "TagsCheck",
                   "BinariesCheck",
diff --git a/rpmlint/Filter.py b/rpmlint/Filter.py
index 060d7699..63eac427 100644
--- a/rpmlint/Filter.py
+++ b/rpmlint/Filter.py
@@ -10,7 +10,6 @@
 from __future__ import print_function
 
 import locale
-import sys
 import textwrap
 
 from rpmlint import Config
diff --git a/rpmlint/LSBCheck.py b/rpmlint/LSBCheck.py
index 1a09856a..7c20d476 100644
--- a/rpmlint/LSBCheck.py
+++ b/rpmlint/LSBCheck.py
@@ -11,7 +11,6 @@
 import re
 
 import rpm
-
 from rpmlint import AbstractCheck
 from rpmlint.Filter import addDetails, printError
 
diff --git a/rpmlint/MenuXDGCheck.py b/rpmlint/MenuXDGCheck.py
index 6dc93cb7..b98fe399 100644
--- a/rpmlint/MenuXDGCheck.py
+++ b/rpmlint/MenuXDGCheck.py
@@ -7,8 +7,8 @@
 #
 
 import codecs
-import os
 import configparser as cfgparser
+import os
 
 from rpmlint import AbstractCheck
 from rpmlint.Filter import addDetails, printError, printWarning
diff --git a/scripts/lint.py b/scripts/lint.py
index 45213d82..0c136712 100755
--- a/scripts/lint.py
+++ b/scripts/lint.py
@@ -11,13 +11,13 @@
 
 import getopt
 import glob
+import importlib
 import locale
 import os
 import re
 import stat
 import sys
 import tempfile
-import importlib
 
 # Do not import anything that initializes its global variables from
 # Config at load time here (or anything that imports such a thing),
@@ -25,6 +25,7 @@ import importlib
 # loaded which is too early - settings from config files won't take
 # place for those variables.
 
+from rpmlint import __version__
 from rpmlint import AbstractCheck
 from rpmlint import Config
 from rpmlint import Pkg
@@ -58,7 +59,7 @@ def usage(name):
 
 # Print version information
 def printVersion():
-    print('rpmlint version %s' % Config.__version__)
+    print('rpmlint version %s' % __version__)
 
 
 def loadCheck(name):
@@ -72,6 +73,7 @@ def loadCheck(name):
     except ImportError:
         importlib.import_module(name)
 
+
 #############################################################################
 # main program
 #############################################################################