From cf40a2a8ef71409fba35bb28b3a7df65f6e3a361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Sun, 7 Apr 2019 21:20:02 +0200
Subject: [PATCH] Fix wrong-import-order pylint errors

---
 gajim/common/jingle_ftstates.py     | 6 ++++--
 gajim/common/protocol/bytestream.py | 6 ++++--
 scripts/dev/pylint-ci.sh            | 3 +--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gajim/common/jingle_ftstates.py b/gajim/common/jingle_ftstates.py
index a6547a7b6..767b636dc 100644
--- a/gajim/common/jingle_ftstates.py
+++ b/gajim/common/jingle_ftstates.py
@@ -12,12 +12,14 @@
 # You should have received a copy of the GNU General Public License
 # along with Gajim. If not, see <http://www.gnu.org/licenses/>.
 
+import logging
+
 import nbxmpp
 from gajim.common import app
 from gajim.common.jingle_transport import TransportType
-from gajim.common.socks5 import Socks5ReceiverClient, Socks5SenderClient
+from gajim.common.socks5 import Socks5ReceiverClient
+from gajim.common.socks5 import Socks5SenderClient
 
-import logging
 log = logging.getLogger('gajim.c.jingle_ftstates')
 
 
diff --git a/gajim/common/protocol/bytestream.py b/gajim/common/protocol/bytestream.py
index c9fb722cf..d12cbe513 100644
--- a/gajim/common/protocol/bytestream.py
+++ b/gajim/common/protocol/bytestream.py
@@ -26,10 +26,12 @@
 
 import socket
 import base64
-from gi.repository import GLib
 import time
+import logging
 
 import nbxmpp
+from gi.repository import GLib
+
 from gajim.common import app
 from gajim.common import helpers
 from gajim.common import ged
@@ -37,7 +39,7 @@ from gajim.common import jingle_xtls
 from gajim.common.file_props import FilesProp
 from gajim.common.socks5 import Socks5SenderClient
 
-import logging
+
 log = logging.getLogger('gajim.c.p.bytestream')
 
 def is_transfer_paused(file_props):
diff --git a/scripts/dev/pylint-ci.sh b/scripts/dev/pylint-ci.sh
index 9003f8e25..f2a11d623 100755
--- a/scripts/dev/pylint-ci.sh
+++ b/scripts/dev/pylint-ci.sh
@@ -1,13 +1,12 @@
 #!/bin/sh
 PYLINT=${PYLINT:-pylint}
 
-"$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 "$@"
+"$PYLINT" --disable=C0103,C0302,C0301,C0330,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
 # C0302 too-many-lines
 # C0330 bad-continuation
-# C0411 wrong-import-order
 # C0412 ungrouped-imports
 # E0203 access-member-before-definition
 # E0401 import-error