Run black and lint fixes

Author: jwijenbergh

eduvpn/app.py

@@ -10,8 +10,13 @@
 from eduvpn_common.discovery import DiscoOrganization, DiscoServer
 from eduvpn_common.error import WrappedError
 from eduvpn_common.main import EduVPN
-from eduvpn_common.server import (Config, InstituteServer,
-                                  SecureInternetServer, Server, Token)
+from eduvpn_common.server import (
+    Config,
+    InstituteServer,
+    SecureInternetServer,
+    Server,
+    Token,
+)
 from eduvpn_common.state import State, StateType
 from eduvpn_common.types import ReadRxBytes
 

eduvpn/cli.py

@@ -14,8 +14,13 @@
 from eduvpn.app import Application
 from eduvpn.i18n import country, retrieve_country_name
 from eduvpn.server import ServerDatabase
-from eduvpn.settings import (CLIENT_ID, CONFIG_DIR_MODE, CONFIG_PREFIX,
-                             LETSCONNECT_CLIENT_ID, LETSCONNECT_CONFIG_PREFIX)
+from eduvpn.settings import (
+    CLIENT_ID,
+    CONFIG_DIR_MODE,
+    CONFIG_PREFIX,
+    LETSCONNECT_CLIENT_ID,
+    LETSCONNECT_CONFIG_PREFIX,
+)
 from eduvpn.ui.search import ServerGroup, group_servers
 from eduvpn.ui.utils import get_validity_text, should_show_error
 from eduvpn.utils import cmd_transition, init_logger, run_in_background_thread

eduvpn/nm.py

@@ -747,7 +747,7 @@ def connection_status(
         self,
     ) -> Tuple[Optional[str], Optional["NM.ActiveConnectionState"]]:
         con = self.client.get_primary_connection()
-        if type(con) != NM.VpnConnection:
+        if not isinstance(con, NM.VpnConnection):
             return None, None
         uuid = con.get_uuid()
         status = con.get_state()

eduvpn/ui/ui.py

@@ -28,12 +28,25 @@
 from eduvpn.settings import FLAG_PREFIX, IMAGE_PREFIX
 from eduvpn.ui import search
 from eduvpn.ui.stats import NetworkStats
-from eduvpn.ui.utils import (QUIT_ID, get_validity_text, link_markup,
-                             should_show_error, show_error_dialog,
-                             show_ui_component, style_widget)
-from eduvpn.utils import (ERROR_STATE, get_prefix, get_ui_state, log_exception,
-                          run_in_background_thread, run_in_glib_thread,
-                          run_periodically, ui_transition)
+from eduvpn.ui.utils import (
+    QUIT_ID,
+    get_validity_text,
+    link_markup,
+    should_show_error,
+    show_error_dialog,
+    show_ui_component,
+    style_widget,
+)
+from eduvpn.utils import (
+    ERROR_STATE,
+    get_prefix,
+    get_ui_state,
+    log_exception,
+    run_in_background_thread,
+    run_in_glib_thread,
+    run_periodically,
+    ui_transition,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -485,7 +498,10 @@ def recreate_profile_combo(self, server_info) -> None:
         active_profile = 0
         sorted_profiles = sorted(server_info.profiles.profiles, key=lambda p: str(p))
         for index, profile in enumerate(sorted_profiles):
-            if server_info.profiles.current is not None and profile.identifier == server_info.profiles.current.identifier:
+            if (
+                server_info.profiles.current is not None
+                and profile.identifier == server_info.profiles.current.identifier
+            ):
                 active_profile = index
             profile_store.append([str(profile), profile])  # type: ignore
 
@@ -1209,7 +1225,10 @@ def on_profile_combo_changed(self, combo):
                 active_profile = 0
                 sorted_profiles = sorted(profiles.profiles, key=lambda p: str(p))
                 for index, profile in enumerate(sorted_profiles):
-                    if profiles.current is not None and profile.identifier == profiles.current.identifier:
+                    if (
+                        profiles.current is not None
+                        and profile.identifier == profiles.current.identifier
+                    ):
                         active_profile = index
 
                 combo.set_active(active_profile)

eduvpn/ui/utils.py

@@ -25,7 +25,7 @@ def style_widget(widget, class_name: str, style: str):
     assert GtkAvailable
     style_context = widget.get_style_context()
     provider = Gtk.CssProvider.new()
-    provider.load_from_data(f".{class_name} {{{style}}}".encode("utf-8"))
+    provider.load_from_data(f".{class_name} {{{style}}}".encode("utf-8"))  # type: ignore
     style_context.add_provider(provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
     style_context.add_class(class_name.split(":")[0])
 

eduvpn/variants.py

@@ -3,8 +3,12 @@
 
 from eduvpn import __version__, settings
 from eduvpn.config import Configuration
-from eduvpn.settings import (CLIENT_ID, CONFIG_PREFIX, LETSCONNECT_CLIENT_ID,
-                             LETSCONNECT_CONFIG_PREFIX)
+from eduvpn.settings import (
+    CLIENT_ID,
+    CONFIG_PREFIX,
+    LETSCONNECT_CLIENT_ID,
+    LETSCONNECT_CONFIG_PREFIX,
+)
 
 
 class ApplicationVariant: