From 97552a711a861c84267f616157cc9b34dbca4ab9 Mon Sep 17 00:00:00 2001 From: rr- Date: Mon, 14 Jan 2019 14:42:29 +0100 Subject: [PATCH] misc: don't use relative imports --- pqcli/ui/basic/__init__.py | 3 +-- pqcli/ui/curses/__init__.py | 3 +-- pqcli/ui/curses/views/confirm_view.py | 7 ++++--- pqcli/ui/curses/views/roster_view.py | 4 +++- pqcli/ui/curses/widgets/menu.py | 3 +-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pqcli/ui/basic/__init__.py b/pqcli/ui/basic/__init__.py index aade811..c83879d 100644 --- a/pqcli/ui/basic/__init__.py +++ b/pqcli/ui/basic/__init__.py @@ -11,8 +11,7 @@ from pqcli import lingo from pqcli.config import CLASSES, PRIME_STATS, RACES from pqcli.mechanic import Player, Simulation, StatsBuilder, create_player from pqcli.roster import Roster - -from ..base import BaseUserInterface +from pqcli.ui.base import BaseUserInterface LOGO = """ ____ ___ _ diff --git a/pqcli/ui/curses/__init__.py b/pqcli/ui/curses/__init__.py index 6ae750b..3196c4a 100644 --- a/pqcli/ui/curses/__init__.py +++ b/pqcli/ui/curses/__init__.py @@ -9,6 +9,7 @@ from pqcli import lingo from pqcli.config import Class, Race from pqcli.mechanic import Player, Stats, create_player from pqcli.roster import Roster +from pqcli.ui.base import BaseUserInterface from pqcli.ui.curses.colors import ( COLOR_FOCUSED, COLOR_LOGO, @@ -31,8 +32,6 @@ from pqcli.ui.curses.views import ( RosterView, ) -from ..base import BaseUserInterface - class StopMainLoop(Exception): pass diff --git a/pqcli/ui/curses/views/confirm_view.py b/pqcli/ui/curses/views/confirm_view.py index 47e3dfe..c393376 100644 --- a/pqcli/ui/curses/views/confirm_view.py +++ b/pqcli/ui/curses/views/confirm_view.py @@ -1,8 +1,9 @@ import typing as T -from ..event_handler import EventHandler -from ..util import Choice -from ..widgets import Menu +from pqcli.ui.curses.event_handler import EventHandler +from pqcli.ui.curses.util import Choice +from pqcli.ui.curses.widgets import Menu + from .base_view import BaseView diff --git a/pqcli/ui/curses/views/roster_view.py b/pqcli/ui/curses/views/roster_view.py index a03e395..4f4017a 100644 --- a/pqcli/ui/curses/views/roster_view.py +++ b/pqcli/ui/curses/views/roster_view.py @@ -24,7 +24,9 @@ LOGO = """ █▄▄▀ █▀▀ ▄▀▀▄ ▄▀▀▄ █▀▀ ▄▀▀▄ ▄▀▀▀ ▄▀▀▀ █ █ █ █ ▄▀▀▄ ▄▀▀▀ ▀█▀ █ █ █ █ ▀▄▄█ █ █▀▀ ▀▀▄ ▀▀▄ █ ▌█ █ █ █▀▀ ▀▀▄ █ ▀ ▀ ▀▀ ▄▄▀ ▀ ▀▀ ▀▀▀ ▀▀▀ ▀▀▌ ▀▀ ▀▀ ▀▀▀ ▀ -""".strip("\n") +""".strip( + "\n" +) class MainMenu(Menu): diff --git a/pqcli/ui/curses/widgets/menu.py b/pqcli/ui/curses/widgets/menu.py index d0fcfb5..a26fb70 100644 --- a/pqcli/ui/curses/widgets/menu.py +++ b/pqcli/ui/curses/widgets/menu.py @@ -2,10 +2,9 @@ import curses import curses.ascii import typing as T -from pqcli.ui.curses.util import KEYS_CYCLE, KEYS_DOWN, KEYS_UP +from pqcli.ui.curses.util import KEYS_CYCLE, KEYS_DOWN, KEYS_UP, Choice from pqcli.ui.curses.widgets.focusable import focus_standout -from ..util import Choice from .base import Widget