From 84f9b1e2d2bda2421837fd22bf733a3e5abcb5f6 Mon Sep 17 00:00:00 2001 From: gryf Date: Fri, 7 Aug 2020 12:40:52 +0200 Subject: [PATCH] Fix imports --- wicd/curses/configscript_curses.py | 6 ++++-- wicd/curses/curses_misc.py | 2 +- wicd/curses/netentry_curses.py | 3 ++- wicd/curses/prefs_curses.py | 6 +++++- wicd/curses/wicd_curses.py | 24 ++++++++++++++++-------- 5 files changed, 28 insertions(+), 13 deletions(-) diff --git a/wicd/curses/configscript_curses.py b/wicd/curses/configscript_curses.py index 088ef40..fe27a4a 100644 --- a/wicd/curses/configscript_curses.py +++ b/wicd/curses/configscript_curses.py @@ -31,8 +31,10 @@ import urwid.curses_display from wicd.translations import _ -from configscript import write_scripts, get_script_info -from configscript import none_to_blank, blank_to_none +from wicd.curses.configscript import blank_to_none +from wicd.curses.configscript import get_script_info +from wicd.curses.configscript import none_to_blank +from wicd.curses.configscript import write_scripts ui = None frame = None diff --git a/wicd/curses/curses_misc.py b/wicd/curses/curses_misc.py index 06f5220..22daee7 100644 --- a/wicd/curses/curses_misc.py +++ b/wicd/curses/curses_misc.py @@ -21,11 +21,11 @@ wicd-curses. # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301, USA. +from functools import reduce import urwid from wicd.translations import _ -from functools import reduce # Uses code that is towards the bottom diff --git a/wicd/curses/netentry_curses.py b/wicd/curses/netentry_curses.py index 647481b..fc20338 100644 --- a/wicd/curses/netentry_curses.py +++ b/wicd/curses/netentry_curses.py @@ -23,7 +23,8 @@ form! import os import urwid -from curses_misc import DynWrap, MaskingEdit, ComboBox, error + +from wicd.curses.curses_misc import DynWrap, MaskingEdit, ComboBox, error import wicd.misc as misc from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool diff --git a/wicd/curses/prefs_curses.py b/wicd/curses/prefs_curses.py index 0d3e172..da5ac04 100644 --- a/wicd/curses/prefs_curses.py +++ b/wicd/curses/prefs_curses.py @@ -24,7 +24,11 @@ import urwid.curses_display from wicd import misc from wicd.translations import _ -from curses_misc import SelText, DynWrap, DynRadioButton, ComboBox, TabColumns +from wicd.curses.curses_misc import SelText +from wicd.curses.curses_misc import DynWrap +from wicd.curses.curses_misc import DynRadioButton +from wicd.curses.curses_misc import ComboBox +from wicd.curses.curses_misc import TabColumns daemon = None wireless = None diff --git a/wicd/curses/wicd_curses.py b/wicd/curses/wicd_curses.py index 2272dda..ad6de39 100644 --- a/wicd/curses/wicd_curses.py +++ b/wicd/curses/wicd_curses.py @@ -51,12 +51,20 @@ from wicd import dbusmanager from wicd.translations import _ # Curses UIs for other stuff -from curses_misc import ComboBox, Dialog2, NSelListBox, SelText, OptCols -from curses_misc import TextDialog, InputDialog, error, DynEdit, DynIntEdit -from prefs_curses import PrefsDialog - -import netentry_curses -from netentry_curses import WirelessSettingsDialog, WiredSettingsDialog +from wicd.curses.curses_misc import OptCols +from wicd.curses.curses_misc import SelText +from wicd.curses.curses_misc import NSelListBox +from wicd.curses.curses_misc import Dialog2 +from wicd.curses.curses_misc import ComboBox +from wicd.curses.curses_misc import DynIntEdit +from wicd.curses.curses_misc import DynEdit +from wicd.curses.curses_misc import error +from wicd.curses.curses_misc import InputDialog +from wicd.curses.curses_misc import TextDialog +from wicd.curses.prefs_curses import PrefsDialog +from wicd.curses import netentry_curses +from wicd.curses.netentry_curses import WirelessSettingsDialog +from wicd.curses.netentry_curses import WiredSettingsDialog # Stuff about getting the script configurer running # from grp import getgrgid @@ -1167,7 +1175,7 @@ class appGUI(): self.update_status() -def run(): +def main_entry(): """Main function.""" global ui, dlogger # We are not python. @@ -1291,7 +1299,7 @@ def main(): # help="enable logging of wicd-curses (currently does nothing)") (options, args) = parser.parse_args() - run() + main_entry() if __name__ == "__main__":