Use non-conflict import name
This commit is contained in:
parent
6e36f910ef
commit
d017f293fc
@ -1,7 +1,7 @@
|
|||||||
from gi import require_version
|
from gi import require_version
|
||||||
from trio import CancelScope, open_process, run_process
|
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("Gtk", "3.0")
|
||||||
require_version("Gdk", "3.0")
|
require_version("Gdk", "3.0")
|
||||||
|
@ -4,8 +4,8 @@ gi.require_version("Gtk", "3.0")
|
|||||||
|
|
||||||
from gi.repository import Gdk, GLib, Gtk
|
from gi.repository import Gdk, GLib, Gtk
|
||||||
|
|
||||||
from dropship import log
|
|
||||||
from dropship.constant import DEFAULT_DROP_LABEL, UI_DIR
|
from dropship.constant import DEFAULT_DROP_LABEL, UI_DIR
|
||||||
|
from dropship.logger import log
|
||||||
|
|
||||||
|
|
||||||
@Gtk.Template.from_file(f"{UI_DIR}/pendingTransferRow.ui")
|
@Gtk.Template.from_file(f"{UI_DIR}/pendingTransferRow.ui")
|
||||||
|
@ -2,7 +2,7 @@ from subprocess import PIPE
|
|||||||
|
|
||||||
from trio import TASK_STATUS_IGNORED, CancelScope, open_process, run_process
|
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):
|
async def wormhole_send(fpath, parent, task_status=TASK_STATUS_IGNORED):
|
||||||
|
Loading…
Reference in New Issue
Block a user