gryf/wicd
1
0
Fork 0
mirror of https://github.com/gryf/wicd.git synced 2026-01-29 20:05:45 +01:00
Code Issues Projects Releases Wiki Activity

Fix imports

Browse Source
This commit is contained in:
gryf
2020-08-07 12:40:52 +02:00
parent fe0cb5ad40
commit 84f9b1e2d2
5 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wicd/curses/configscript_curses.py
View File

@@ -31,8 +31,10 @@ import urwid.curses_display
from wicd.translations import _ from wicd.translations import _
from configscript import write_scripts, get_script_info from wicd.curses.configscript import blank_to_none
from configscript import none_to_blank, 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 ui = None
frame = None frame = None

2
wicd/curses/curses_misc.py
View File

@@ -21,11 +21,11 @@ wicd-curses.
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
# MA 02110-1301, USA. # MA 02110-1301, USA.
from functools import reduce
import urwid import urwid
from wicd.translations import _ from wicd.translations import _
from functools import reduce
# Uses code that is towards the bottom # Uses code that is towards the bottom

3
wicd/curses/netentry_curses.py
View File

@@ -23,7 +23,8 @@ form!
import os import os
import urwid 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 import wicd.misc as misc
from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool

6
wicd/curses/prefs_curses.py
View File

@@ -24,7 +24,11 @@ import urwid.curses_display
from wicd import misc from wicd import misc
from wicd.translations import _ 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 daemon = None
wireless = None wireless = None

24
wicd/curses/wicd_curses.py
View File

@@ -51,12 +51,20 @@ from wicd import dbusmanager
from wicd.translations import _ from wicd.translations import _
# Curses UIs for other stuff # Curses UIs for other stuff
from curses_misc import ComboBox, Dialog2, NSelListBox, SelText, OptCols from wicd.curses.curses_misc import OptCols
from curses_misc import TextDialog, InputDialog, error, DynEdit, DynIntEdit from wicd.curses.curses_misc import SelText
from prefs_curses import PrefsDialog from wicd.curses.curses_misc import NSelListBox
from wicd.curses.curses_misc import Dialog2
import netentry_curses from wicd.curses.curses_misc import ComboBox
from netentry_curses import WirelessSettingsDialog, WiredSettingsDialog 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 # Stuff about getting the script configurer running
# from grp import getgrgid # from grp import getgrgid
@@ -1167,7 +1175,7 @@ class appGUI():
self.update_status() self.update_status()
def run(): def main_entry():
"""Main function.""" """Main function."""
global ui, dlogger global ui, dlogger
# We are not python. # We are not python.
@@ -1291,7 +1299,7 @@ def main():
# help="enable logging of wicd-curses (currently does nothing)") # help="enable logging of wicd-curses (currently does nothing)")
(options, args) = parser.parse_args() (options, args) = parser.parse_args()
run() main_entry()
if __name__ == "__main__": if __name__ == "__main__":