cq: Sort imports with isort

14 files changed, 25 insertions, 29 deletions

diff --git a/test/gtk/assistant.py b/test/gtk/assistant.py
index 9f3c2af0a..7d31e0890 100644
--- a/test/gtk/assistant.py
+++ b/test/gtk/assistant.py
@@ -1,8 +1,8 @@
 from gi.repository import Gtk
 
+from gajim import gui
 from gajim.common.const import CSSPriority
 
-from gajim import gui
 gui.init('gtk')
 
 from gajim.gui.assistant import Assistant
diff --git a/test/gtk/certificate_dialog.py b/test/gtk/certificate_dialog.py
index d18838ffc..1435c9367 100644
--- a/test/gtk/certificate_dialog.py
+++ b/test/gtk/certificate_dialog.py
@@ -1,9 +1,9 @@
 from gi.repository import Gio
 from gi.repository import Gtk
 
+from gajim import gui
 from gajim.common.const import CSSPriority
 
-from gajim import gui
 gui.init('gtk')
 
 from gajim.gui.certificate_dialog import CertificateDialog
diff --git a/test/gtk/change_password.py b/test/gtk/change_password.py
index f2dc72557..b6d454667 100644
--- a/test/gtk/change_password.py
+++ b/test/gtk/change_password.py
@@ -1,16 +1,14 @@
-from unittest.mock import MagicMock
-
 from functools import partial
+from unittest.mock import MagicMock
 
+from gi.repository import Gtk
 from nbxmpp.modules.dataforms import create_field
 from nbxmpp.modules.dataforms import SimpleDataForm
 
-from gi.repository import Gtk
-
+from gajim import gui
 from gajim.common import app
 from gajim.common.const import CSSPriority
 
-from gajim import gui
 gui.init('gtk')
 
 from gajim.gui.change_password import ChangePassword
diff --git a/test/gtk/dataform.py b/test/gtk/dataform.py
index abf4c5d71..98e224536 100644
--- a/test/gtk/dataform.py
+++ b/test/gtk/dataform.py
@@ -1,16 +1,14 @@
-from unittest.mock import MagicMock
-
 from base64 import b64decode
+from unittest.mock import MagicMock
 
+from gi.repository import Gtk
 from nbxmpp.modules.dataforms import extend_form
 from nbxmpp.simplexml import Node
 
-from gi.repository import Gtk
-
+from gajim import gui
 from gajim.common import app
 from gajim.common.const import CSSPriority
 
-from gajim import gui
 gui.init('gtk')
 
 from gajim.gui.dataform import DataFormWidget
diff --git a/test/gtk/fake_dataform.py b/test/gtk/fake_dataform.py
index f43156ca9..5de103449 100644
--- a/test/gtk/fake_dataform.py
+++ b/test/gtk/fake_dataform.py
@@ -1,10 +1,10 @@
 from gi.repository import Gtk
 
 from gajim import gui
+
 gui.init('gtk')
 
 from gajim.common.const import CSSPriority
-
 from gajim.gui.dataform import FakeDataFormWidget
 
 from . import util
diff --git a/test/gtk/groupchat_info.py b/test/gtk/groupchat_info.py
index f41712476..d555bb771 100644
--- a/test/gtk/groupchat_info.py
+++ b/test/gtk/groupchat_info.py
@@ -1,15 +1,14 @@
 from unittest.mock import MagicMock
 
-from nbxmpp.protocol import Iq
+from gi.repository import Gtk
 from nbxmpp.modules.discovery import parse_disco_info
+from nbxmpp.protocol import Iq
 from nbxmpp.structs import MucSubject
 
-from gi.repository import Gtk
-
+from gajim import gui
 from gajim.common import app
 from gajim.common.const import CSSPriority
 
-from gajim import gui
 gui.init('gtk')
 
 from gajim.gui.groupchat_info import GroupChatInfoScrolled
diff --git a/test/gtk/ssl_error_dialog.py b/test/gtk/ssl_error_dialog.py
index 0d89c7722..fa8b0913c 100644
--- a/test/gtk/ssl_error_dialog.py
+++ b/test/gtk/ssl_error_dialog.py
@@ -4,10 +4,10 @@ from gi.repository import Gio
 from gi.repository import Gtk
 
 from gajim import gui
+
 gui.init('gtk')
 from gajim.common import app
 from gajim.common.const import CSSPriority
-
 from gajim.gui.ssl_error_dialog import SSLErrorDialog
 
 from . import util
diff --git a/test/no_gui/test_gtk_menus.py b/test/no_gui/test_gtk_menus.py
index 0d38a915f..0fa84754a 100644
--- a/test/no_gui/test_gtk_menus.py
+++ b/test/no_gui/test_gtk_menus.py
@@ -1,9 +1,9 @@
 import unittest
 
+from gajim import gui
 from gajim.common.const import URIType
 from gajim.common.const import XmppUriQuery
 
-from gajim import gui
 gui.init('gtk')
 
 from gajim.gtk.menus import _uri_context_menus
diff --git a/test/no_gui/test_gtk_util.py b/test/no_gui/test_gtk_util.py
index 64df311e8..7f1ba972e 100644
--- a/test/no_gui/test_gtk_util.py
+++ b/test/no_gui/test_gtk_util.py
@@ -1,6 +1,7 @@
 import unittest
 
 from gajim import gui
+
 gui.init('gtk')
 
 from gajim.gtk.util import get_first_grapheme
diff --git a/test/no_gui/test_nick_completion.py b/test/no_gui/test_nick_completion.py
index a681f712f..73da7e2d1 100644
--- a/test/no_gui/test_nick_completion.py
+++ b/test/no_gui/test_nick_completion.py
@@ -1,9 +1,9 @@
 import unittest
 from unittest.mock import MagicMock
 
+from gajim import gui
 from gajim.common import app
 
-from gajim import gui
 gui.init('gtk')
 
 from gajim.gui.groupchat_nick_completion import GroupChatNickCompletion
diff --git a/test/no_gui/test_regex.py b/test/no_gui/test_regex.py
index 1a888df79..774530761 100644
--- a/test/no_gui/test_regex.py
+++ b/test/no_gui/test_regex.py
@@ -1,11 +1,10 @@
 from typing import Any
 
-import unittest
 import re
+import unittest
 
 from gajim.common import regex
 
-
 TEST_URIS = [
     'scheme:',
     'http:///',
diff --git a/test/no_gui/test_sanitize_filename.py b/test/no_gui/test_sanitize_filename.py
index 46e156037..5187dfae5 100644
--- a/test/no_gui/test_sanitize_filename.py
+++ b/test/no_gui/test_sanitize_filename.py
@@ -2,6 +2,7 @@
 import sys
 import unittest
 from unittest.mock import patch
+
 from gajim.common.helpers import sanitize_filename
 
 
diff --git a/test/no_gui/test_styling.py b/test/no_gui/test_styling.py
index 81c2df3cb..96635cda4 100644
--- a/test/no_gui/test_styling.py
+++ b/test/no_gui/test_styling.py
@@ -2,22 +2,22 @@ import unittest
 from unittest.mock import MagicMock
 
 from gajim import gui
+
 gui.init('gtk')
 
 from gajim.common import app  # Avoids circular imports from common.helpers
 from gajim.common import styling
+from gajim.common.styling import EmphasisSpan
+from gajim.common.styling import Hyperlink
 from gajim.common.styling import PlainBlock
 from gajim.common.styling import PreBlock
-from gajim.common.styling import QuoteBlock
 from gajim.common.styling import PreTextSpan
-from gajim.common.styling import StrongSpan
-from gajim.common.styling import EmphasisSpan
-from gajim.common.styling import StrikeSpan
-from gajim.common.styling import Hyperlink
 from gajim.common.styling import process_uris
+from gajim.common.styling import QuoteBlock
+from gajim.common.styling import StrikeSpan
+from gajim.common.styling import StrongSpan
 from gajim.common.util.text import escape_iri_query
 
-
 app.settings = MagicMock()
 # additional_uri_schemes
 app.settings.get = MagicMock(return_value='a a- a. scheme')
diff --git a/test/no_gui/test_text_util.py b/test/no_gui/test_text_util.py
index 26df53b08..7e984d1f6 100644
--- a/test/no_gui/test_text_util.py
+++ b/test/no_gui/test_text_util.py
@@ -1,8 +1,8 @@
 import unittest
 
 from gajim.common.util.text import escape_iri_path_segment
-from gajim.common.util.text import jid_to_iri
 from gajim.common.util.text import format_duration
+from gajim.common.util.text import jid_to_iri
 from gajim.common.util.text import remove_invalid_xml_chars