Browse Source

Use non-conflict import name

croc
Luke Murphy 4 years ago
parent
commit
d017f293fc
No known key found for this signature in database GPG Key ID: 5E2EF5A63E3718CC
  1. 2
      dropship/dropship.py
  2. 0
      dropship/logger.py
  3. 2
      dropship/ui_templates.py
  4. 2
      dropship/wormhole.py

2
dropship/dropship.py

@ -1,7 +1,7 @@
from gi import require_version
from trio import CancelScope, open_process, run_process
from dropship.logging import log
from dropship.logger import log
require_version("Gtk", "3.0")
require_version("Gdk", "3.0")

0
dropship/logging.py → dropship/logger.py

2
dropship/ui_templates.py

@ -4,8 +4,8 @@ gi.require_version("Gtk", "3.0")
from gi.repository import Gdk, GLib, Gtk
from dropship import log
from dropship.constant import DEFAULT_DROP_LABEL, UI_DIR
from dropship.logger import log
@Gtk.Template.from_file(f"{UI_DIR}/pendingTransferRow.ui")

2
dropship/wormhole.py

@ -2,7 +2,7 @@ from subprocess import PIPE
from trio import TASK_STATUS_IGNORED, CancelScope, open_process, run_process
from dropship.logging import log
from dropship.logger import log
async def wormhole_send(fpath, parent, task_status=TASK_STATUS_IGNORED):

Loading…
Cancel
Save