From 9db3dea48aa455e847e9d3a214e2e6e9d3bbc7b6 Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Sun, 11 Dec 2022 14:52:09 -0600 Subject: [PATCH] Made imports pythonic --- src/__builtins__.py | 3 ++- src/core/controller.py | 2 +- src/core/mixins/dummy_mixin.py | 9 +++++++++ src/plugins/manifest.py | 3 ++- src/plugins/plugin_base.py | 3 ++- src/plugins/plugins_controller.py | 11 ++++++++--- src/utils/ipc_server.py | 11 +++++++---- src/utils/logger.py | 3 ++- src/utils/settings.py | 16 ++++++++-------- 9 files changed, 41 insertions(+), 20 deletions(-) diff --git a/src/__builtins__.py b/src/__builtins__.py index d676771..347540b 100644 --- a/src/__builtins__.py +++ b/src/__builtins__.py @@ -1,4 +1,5 @@ -import builtins, threading +import builtins +import threading # Python imports import builtins diff --git a/src/core/controller.py b/src/core/controller.py index c31979f..55ae327 100644 --- a/src/core/controller.py +++ b/src/core/controller.py @@ -82,6 +82,6 @@ class Controller(DummyMixin, ControllerData): def set_clipboard_data(self, data: type) -> None: proc = subprocess.Popen(['xclip','-selection','clipboard'], stdin=subprocess.PIPE) - proc.stdin.write(data) + proc.stdin.write(data.encode("utf-8")) proc.stdin.close() retcode = proc.wait() diff --git a/src/core/mixins/dummy_mixin.py b/src/core/mixins/dummy_mixin.py index eff59cc..675bb81 100644 --- a/src/core/mixins/dummy_mixin.py +++ b/src/core/mixins/dummy_mixin.py @@ -1,3 +1,12 @@ +# Python imports + +# Lib imports + +# Application imports + + + + class DummyMixin: """ DummyMixin is an example of how mixins are used and structured in a project. """ diff --git a/src/plugins/manifest.py b/src/plugins/manifest.py index 1865fa3..4088eed 100644 --- a/src/plugins/manifest.py +++ b/src/plugins/manifest.py @@ -1,5 +1,6 @@ # Python imports -import os, json +import os +import json from os.path import join # Lib imports diff --git a/src/plugins/plugin_base.py b/src/plugins/plugin_base.py index 974583a..3130bb4 100644 --- a/src/plugins/plugin_base.py +++ b/src/plugins/plugin_base.py @@ -1,5 +1,6 @@ # Python imports -import os, time +import os +import time # Lib imports diff --git a/src/plugins/plugins_controller.py b/src/plugins/plugins_controller.py index 3c41dd3..04c2d22 100644 --- a/src/plugins/plugins_controller.py +++ b/src/plugins/plugins_controller.py @@ -1,11 +1,16 @@ # Python imports -import os, sys, importlib, traceback -from os.path import join, isdir +import os +import sys +import portlib +import traceback +from os.path import join +from os.path import isdir # Lib imports import gi gi.require_version('Gtk', '3.0') -from gi.repository import Gtk, Gio +from gi.repository import Gtk +from gi.repository import Gio # Application imports from .manifest import Plugin, ManifestProcessor diff --git a/src/utils/ipc_server.py b/src/utils/ipc_server.py index 92b94fe..0b883df 100644 --- a/src/utils/ipc_server.py +++ b/src/utils/ipc_server.py @@ -1,6 +1,9 @@ # Python imports -import os, threading, time -from multiprocessing.connection import Listener, Client +import os +import threading +import ime +from multiprocessing.connection import Client +from multiprocessing.connection import Listener # Lib imports @@ -55,11 +58,11 @@ class IPCServer: while True: conn = listener.accept() start_time = time.perf_counter() - self.handle_ipc_message(conn, start_time) + self._handle_ipc_message(conn, start_time) listener.close() - def handle_ipc_message(self, conn, start_time) -> None: + def _handle_ipc_message(self, conn, start_time) -> None: while True: msg = conn.recv() if settings.is_debug(): diff --git a/src/utils/logger.py b/src/utils/logger.py index c33444f..436a511 100644 --- a/src/utils/logger.py +++ b/src/utils/logger.py @@ -1,5 +1,6 @@ # Python imports -import os, logging +import os +import logging # Application imports diff --git a/src/utils/settings.py b/src/utils/settings.py index 81e017e..560f2e3 100644 --- a/src/utils/settings.py +++ b/src/utils/settings.py @@ -114,16 +114,16 @@ class Settings: self._builder.connect_signals(handlers) - def get_builder(self) -> any: return self._builder def set_builder(self, builder) -> any: self._builder = builder + def get_builder(self) -> any: return self._builder def get_glade_file(self) -> str: return self._GLADE_FILE - def get_logger(self) -> Logger: return self._logger - def get_plugins_path(self) -> str: return self._PLUGINS_PATH - def get_icon_theme(self) -> str: return self._ICON_THEME - def get_css_file(self) -> str: return self._CSS_FILE - def get_window_icon(self) -> str: return self._WINDOW_ICON - def get_home_path(self) -> str: return self._USER_HOME + def get_logger(self) -> Logger: return self._logger + def get_plugins_path(self) -> str: return self._PLUGINS_PATH + def get_icon_theme(self) -> str: return self._ICON_THEME + def get_css_file(self) -> str: return self._CSS_FILE + def get_window_icon(self) -> str: return self._WINDOW_ICON + def get_home_path(self) -> str: return self._USER_HOME # Filter returns def get_office_filter(self) -> tuple: return self._office_filter @@ -139,7 +139,7 @@ class Settings: def is_trace_debug(self) -> str: return self._trace_debug def is_debug(self) -> str: return self._debug - def is_dirty_start(self) -> bool: return self._dirty_start + def is_dirty_start(self) -> bool: return self._dirty_start def clear_pid(self): self._clean_pid() def set_trace_debug(self, trace_debug):