7 files changed, 22 insertions, 23 deletions
diff --git a/gajim/common/caps_cache.py b/gajim/common/caps_cache.py
index 1b027c7ed..1e8cc40d2 100644
--- a/gajim/common/caps_cache.py
+++ b/gajim/common/caps_cache.py
@@ -29,10 +29,8 @@ through ClientCaps objects which are hold by contact instances.
 
 import base64
 import hashlib
-from collections import namedtuple
-
 import logging
-log = logging.getLogger('gajim.c.caps_cache')
+from collections import namedtuple
 
 import nbxmpp
 from nbxmpp.const import Affiliation
@@ -44,6 +42,8 @@ FEATURE_BLACKLIST = [NS_CHATSTATES, NS_XHTML_IM, NS_ESESSION,
     NS_JINGLE_ICE_UDP, NS_JINGLE_RTP_AUDIO, NS_JINGLE_RTP_VIDEO,
     NS_JINGLE_FILE_TRANSFER_5]
 
+log = logging.getLogger('gajim.c.caps_cache')
+
 # Query entry status codes
 NEW = 0
 QUERIED = 1
diff --git a/gajim/common/connection.py b/gajim/common/connection.py
index f004520cd..8fc4d8fc7 100644
--- a/gajim/common/connection.py
+++ b/gajim/common/connection.py
@@ -32,7 +32,7 @@ import sys
 import random
 import socket
 import operator
-import string
+
 import time
 import hashlib
 import json
@@ -40,13 +40,13 @@ import logging
 import base64
 import ssl
 from functools import partial
+import string
 from string import Template
 from urllib.request import urlopen
 from urllib.error import URLError
 
 from gi.repository import GLib
-if sys.platform in ('win32', 'darwin'):
-    import certifi
+
 import OpenSSL.crypto
 import nbxmpp
 from nbxmpp.const import Realm
@@ -76,6 +76,9 @@ from gajim.common.connection_handlers_events import NewAccountConnectedEvent
 from gajim.common.connection_handlers_events import NewAccountNotConnectedEvent
 from gajim.common.connection_handlers_events import MessageSentEvent
 
+if sys.platform in ('win32', 'darwin'):
+    import certifi
+
 
 log = logging.getLogger('gajim.c.connection')
 
diff --git a/gajim/common/jingle_rtp.py b/gajim/common/jingle_rtp.py
index 01f553347..4a6d60a19 100644
--- a/gajim/common/jingle_rtp.py
+++ b/gajim/common/jingle_rtp.py
@@ -18,22 +18,22 @@ Handles Jingle RTP sessions (XEP 0167)
 
 import logging
 import socket
+from collections import deque
+
 import nbxmpp
-import gi
 from gi.repository import Farstream
-
-gi.require_version('Gst', '1.0')
 from gi.repository import Gst
 from gi.repository import GLib
 
 from gajim.common import app
 from gajim.common.i18n import _
 from gajim.common.jingle_transport import JingleTransportICEUDP
-from gajim.common.jingle_content import contents, JingleContent, JingleContentSetupException
+from gajim.common.jingle_content import contents
+from gajim.common.jingle_content import JingleContent
+from gajim.common.jingle_content import JingleContentSetupException
 from gajim.common.connection_handlers_events import InformationEvent
 from gajim.common.jingle_session import FailedApplication
 
-from collections import deque
 
 log = logging.getLogger('gajim.c.jingle_rtp')
 
diff --git a/gajim/common/multimedia_helpers.py b/gajim/common/multimedia_helpers.py
index cf6372aa7..e39273e4a 100644
--- a/gajim/common/multimedia_helpers.py
+++ b/gajim/common/multimedia_helpers.py
@@ -14,9 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 
-import gi
 import logging
-gi.require_version('Gst', '1.0')
+
 from gi.repository import Gst
 
 from gajim.common.i18n import _
diff --git a/gajim/common/proxy65_manager.py b/gajim/common/proxy65_manager.py
index 4fd405381..3068f68d2 100644
--- a/gajim/common/proxy65_manager.py
+++ b/gajim/common/proxy65_manager.py
@@ -20,15 +20,17 @@ import socket
 import struct
 import errno
 import logging
-log = logging.getLogger('gajim.c.proxy65_manager')
 
 import nbxmpp
+from nbxmpp.idlequeue import IdleObject
+
 from gajim.common import app
 from gajim.common import helpers
 from gajim.common.socks5 import Socks5
-from nbxmpp.idlequeue import IdleObject
 from gajim.common.file_props import FilesProp
 
+log = logging.getLogger('gajim.c.proxy65_manager')
+
 S_INITIAL = 0
 S_STARTED = 1
 S_RESOLVED = 2
diff --git a/gajim/history_manager.py b/gajim/history_manager.py
index d78883de1..e075f674a 100644
--- a/gajim/history_manager.py
+++ b/gajim/history_manager.py
@@ -32,11 +32,6 @@ import getopt
 import sqlite3
 from enum import IntEnum, unique
 
-import gi
-gi.require_version('Gtk', '3.0')
-gi.require_version('GLib', '2.0')
-gi.require_version('Gdk', '3.0')
-gi.require_version('Gio', '2.0')
 from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GLib
@@ -85,6 +80,7 @@ if is_standalone():
     configpaths.init()
     app.load_css_config()
 
+# pylint: disable=C0413
 from gajim.common import helpers
 from gajim.gtk.dialogs import YesNoDialog
 from gajim.gtk.dialogs import ErrorDialog
@@ -94,7 +90,7 @@ from gajim.gtk.filechoosers import FileSaveDialog
 from gajim.gtk.util import convert_rgb_to_hex
 from gajim.gtk.util import get_builder
 from gajim.gtk.util import get_app_icon_list
-
+# pylint: enable=C0413
 
 @unique
 class Column(IntEnum):
diff --git a/scripts/dev/pylint-ci.sh b/scripts/dev/pylint-ci.sh
index 16a0c0662..9003f8e25 100755
--- a/scripts/dev/pylint-ci.sh
+++ b/scripts/dev/pylint-ci.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 PYLINT=${PYLINT:-pylint}
 
-"$PYLINT" --disable=C0103,C0302,C0301,C0330,C0411,C0412,C0413,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1133,E1136,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0311,W0401,W0603,W0613 "$@"
+"$PYLINT" --disable=C0103,C0302,C0301,C0330,C0411,C0412,E0203,E0401,E0611,E0710,E0712,E1101,E1102,E1133,E1136,R0201,R0901,R0904,R0912,R0913,R0914,R0915,R0916,R1702,R1710,W0201,W0212,W0221,W0223,W0231,W0233,W0311,W0401,W0603,W0613 "$@"
 
 # C0103 invalid-name
 # C0301 line-too-long
@@ -9,7 +9,6 @@ PYLINT=${PYLINT:-pylint}
 # C0330 bad-continuation
 # C0411 wrong-import-order
 # C0412 ungrouped-imports
-# C0413 wrong-import-position
 # E0203 access-member-before-definition
 # E0401 import-error
 # E0611 no-name-in-module