diff --git a/scripts/dev/run-pylint.py b/scripts/dev/run-pylint.py
index cb611b6bf67d33b78523b0fecd929c926520e45e..480497f59a2fa2e69d89b1195a47977791d3aa5d 100755
--- a/scripts/dev/run-pylint.py
+++ b/scripts/dev/run-pylint.py
@@ -8,4 +8,3 @@ if os.getcwd().endswith('dev'):
     os.chdir('../../src/') # we were in scripts/dev
 
 os.system("pylint --indent-string='\t' --additional-builtins='_' --disable-msg=C0111,C0103,C0111,C0112 --disable-checker=design " + "".join(sys.argv[1:]))
-
diff --git a/setup_win32.py b/setup_win32.py
index 23bfcaff60b2ed516acee07624e5fd506dd284a9..da5a9de501142621949d717678889f0d9fa794bd 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -52,7 +52,8 @@ if 'gtk' in os.listdir('.'):
 opts = {
     'py2exe': {
         # ConfigParser,UserString,roman are needed for docutils
-        'includes': 'pango,atk,gobject,cairo,pangocairo,gtk.keysyms,encodings,encodings.*,ConfigParser,UserString',
+        'includes': ('pango,atk,gobject,cairo,pangocairo,gtk.keysyms,'
+                     'encodings,encodings.*,ConfigParser,UserString'),
         'dll_excludes': [
             'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',
             'libgdk_pixbuf-2.0-0.dll', 'libgdk-win32-2.0-0.dll',
diff --git a/src/common/dataforms.py b/src/common/dataforms.py
index 008de373023f2cb9a090a10962a43d567c57e796..f07ef653fb4c2222e1416f598c0ec208fec5c457 100644
--- a/src/common/dataforms.py
+++ b/src/common/dataforms.py
@@ -555,4 +555,3 @@ class MultipleDataForm(DataForm):
 #                       record.setName('reported')
 #                       self.addChild(node=record)
 #               return locals()
-
diff --git a/src/common/dh.py b/src/common/dh.py
index 4f8ce3804e465753b9845f8fa51d14779a52ddc7..51fe04de1b1d90e3482bde4cc33e75b9e311e1da 100644
--- a/src/common/dh.py
+++ b/src/common/dh.py
@@ -27,28 +27,27 @@ These constants have been obtained from RFC2409 and RFC3526.
 '''
 import string
 
-generators = [  None, # one to get the right offset
-                                                                2,
-                                                                2,
-                                                                None,
-                                                                None,
-                                                                2,
-                                                                None,
-                                                                None,
-                                                                None,
-                                                                None,
-                                                                None,
-                                                                None,
-                                                                None,
-                                                                None,
-                                                                2,                      # group 14
-                                                                2,
-                                                                2,
-                                                                2,
-                                                                2,
-                                                                                        ]
-
-hex_primes = [  None,
+generators = [None, # one to get the right offset
+              2,
+              2,
+              None,
+              None,
+              2,
+              None,
+              None,
+              None,
+              None,
+              None,
+              None,
+              None,
+              None,
+              2, # group 14
+              2,
+              2,
+              2,
+              2]
+
+hex_primes = [None,
 
 # group 1
 '''FFFFFFFF FFFFFFFF C90FDAA2 2168C234 C4C6628B 80DC1CD1
diff --git a/src/common/xmpp/c14n.py b/src/common/xmpp/c14n.py
index 8a771a2afa75cc2a0ac547242b38756330a3e399..48b46db29e5e901c39849f4fa8d453ed413e2943 100644
--- a/src/common/xmpp/c14n.py
+++ b/src/common/xmpp/c14n.py
@@ -54,4 +54,3 @@ def normalise_attr(val):
 
 def normalise_text(val):
     return val.replace('&', '&amp;').replace('<', '&lt;').replace('>', '&gt;').replace('\r', '&#xD;')
-
diff --git a/src/common/xmpp/idlequeue.py b/src/common/xmpp/idlequeue.py
index d521f8ecbe54d3eb1ce0578ab60d9d0af2ec9a55..1ff52c95f5595729d6ddc1ba810c7f02e07e1a6c 100644
--- a/src/common/xmpp/idlequeue.py
+++ b/src/common/xmpp/idlequeue.py
@@ -511,4 +511,3 @@ class GlibIdleQueue(IdleQueue):
 
     def process(self):
         self._check_time_events()
-
diff --git a/src/common/zeroconf/zeroconf_bonjour.py b/src/common/zeroconf/zeroconf_bonjour.py
index cd33f2060346a734f84e7c61ebd24086aec0726f..1eab81ac0e43775b24a3e1f6dd0982444f1e9ddb 100644
--- a/src/common/zeroconf/zeroconf_bonjour.py
+++ b/src/common/zeroconf/zeroconf_bonjour.py
@@ -330,4 +330,3 @@ class Zeroconf:
         except pybonjour.BonjourError:
             return False
         return True
-
diff --git a/src/dialogs.py b/src/dialogs.py
index 7025ed9c2800d85c5e9fad4ff67d02b9b7682b75..a3a44324d58105e9dc7dec411b4cc77ff9213d6e 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -5123,4 +5123,3 @@ class VoIPCallReceivedDialog(object):
                     session.reject_content(content)
 
         dialog.destroy()
-
diff --git a/src/ipython_view.py b/src/ipython_view.py
index 2d140d0f654e3a9e87a51014dd8d14d942cfd95d..b4ee8e2799e8043b31f7854549a74d7b44858c06 100644
--- a/src/ipython_view.py
+++ b/src/ipython_view.py
@@ -533,4 +533,3 @@ class IPythonView(ConsoleView, IterableIPShell):
         if rv: rv = rv.strip('\n')
         self.showReturned(rv)
         self.cout.truncate(0)
-
diff --git a/src/search_window.py b/src/search_window.py
index b0ba46aa5e415988b4e1366ee8019584b9cb2417..dcf87489ed69315693cc0f8de53ead40a079fec5 100644
--- a/src/search_window.py
+++ b/src/search_window.py
@@ -230,4 +230,3 @@ class SearchWindow:
         if self.data_form_widget.title:
             self.window.set_title('%s - Search - Gajim' % \
                     self.data_form_widget.title)
-
diff --git a/test/lib/mock.py b/test/lib/mock.py
index 0dab5ef140247441dd1d8c37fb03fd2a00f1900b..fdaf000dbb932a4c6debc347f4f383cdecbba340 100644
--- a/test/lib/mock.py
+++ b/test/lib/mock.py
@@ -461,6 +461,3 @@ def HASMETHOD(method):
     return testFn
 
 CALLABLE = callable
-
-
-