Skip to content

Commit

Permalink
solaar: move imports to top of files
Browse files Browse the repository at this point in the history
  • Loading branch information
pfps committed Feb 11, 2024
1 parent 86cfafe commit 216bc97
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion lib/solaar/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import yaml as _yaml

from gi.repository import GLib
from logitech_receiver.common import NamedInt as _NamedInt
from solaar import __version__

Expand Down Expand Up @@ -142,7 +143,6 @@ def save(defer=False):
else:
with save_lock:
if not save_timer:
from gi.repository import GLib
save_timer = _Timer(5.0, lambda: GLib.idle_add(do_save))
save_timer.start()

Expand Down
26 changes: 13 additions & 13 deletions lib/solaar/gtk.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
## with this program; if not, write to the Free Software Foundation, Inc.,
## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

import argparse
import faulthandler
import importlib
import logging
import os.path
Expand All @@ -26,8 +28,15 @@
import sys
import tempfile

from traceback import format_exc

import solaar.cli as _cli
import solaar.configuration as _configuration
import solaar.i18n as _i18n
import solaar.listener as _listener
import solaar.ui as _ui
import solaar.ui.common as _common
import solaar.upower as _upower

from solaar import NAME, __version__

Expand All @@ -52,7 +61,6 @@ def _require(module, os_package, gi=None, gi_package=None, gi_version=None):


def _parse_arguments():
import argparse
arg_parser = argparse.ArgumentParser(
prog=NAME.lower(), epilog='For more information see https://pwr-solaar.github.io/Solaar'
)
Expand Down Expand Up @@ -122,7 +130,6 @@ def _parse_arguments():

# On first SIGINT, dump threads to stderr; on second, exit
def _handlesig(signl, stack):
import faulthandler
signal.signal(signal.SIGINT, signal.SIG_DFL)
signal.signal(signal.SIGTERM, signal.SIG_DFL)

Expand Down Expand Up @@ -161,25 +168,18 @@ def main():
logger.warning('Solaar udev file not found in expected location')
logger.warning('See https://pwr-solaar.github.io/Solaar/installation for more information')
try:
import solaar.listener as listener
import solaar.ui as ui
import solaar.ui.common as common

listener.setup_scanner(ui.status_changed, common.error_dialog)
_listener.setup_scanner(_ui.status_changed, _common.error_dialog)

import solaar.upower as _upower
if args.restart_on_wake_up:
_upower.watch(listener.start_all, listener.stop_all)
_upower.watch(_listener.start_all, _listener.stop_all)
else:
_upower.watch(lambda: listener.ping_all(True))
_upower.watch(lambda: _listener.ping_all(True))

import solaar.configuration as _configuration
_configuration.defer_saves = True # allow configuration saves to be deferred

# main UI event loop
ui.run_loop(listener.start_all, listener.stop_all, args.window != 'only', args.window != 'hide')
_ui.run_loop(_listener.start_all, _listener.stop_all, args.window != 'only', args.window != 'hide')
except Exception:
from traceback import format_exc
sys.exit('%s: error: %s' % (NAME.lower(), format_exc()))

temp.close()
Expand Down
9 changes: 4 additions & 5 deletions lib/solaar/i18n.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@

import gettext as _gettext
import locale
import os.path as _path
import sys as _sys

from glob import glob as _glob

from solaar import NAME as _NAME

Expand All @@ -27,13 +31,8 @@


def _find_locale_path(lc_domain):
import os.path as _path
import sys as _sys
prefix_share = _path.normpath(_path.join(_path.realpath(_sys.path[0]), '..'))
src_share = _path.normpath(_path.join(_path.realpath(_sys.path[0]), '..', 'share'))
del _sys

from glob import glob as _glob

for location in prefix_share, src_share:
mo_files = _glob(_path.join(location, 'locale', '*', 'LC_MESSAGES', lc_domain + '.mo'))
Expand Down
2 changes: 1 addition & 1 deletion lib/solaar/listener.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import errno as _errno
import logging
import subprocess
import time

from collections import namedtuple
Expand Down Expand Up @@ -390,7 +391,6 @@ def _process_add(device_info, retry):
except OSError as e:
if e.errno == _errno.EACCES:
try:
import subprocess
output = subprocess.check_output(['/usr/bin/getfacl', '-p', device_info.path], text=True)
if logger.isEnabledFor(logging.WARNING):
logger.warning('Missing permissions on %s\n%s.', device_info.path, output)
Expand Down

0 comments on commit 216bc97

Please sign in to comment.