diff --git a/curses/netentry_curses.py b/curses/netentry_curses.py index 99e9086..0beed28 100644 --- a/curses/netentry_curses.py +++ b/curses/netentry_curses.py @@ -26,11 +26,7 @@ from curses_misc import TextDialog,DynWrap,MaskingEdit,ComboBox,error import wicd.misc as misc from wicd.misc import noneToString, stringToNone, noneToBlankString, to_bool - - from wicd.translations import language -for i in language.keys(): - language[i] = language[i].decode('utf8') daemon = None wired = None diff --git a/curses/prefs_curses.py b/curses/prefs_curses.py old mode 100755 new mode 100644 index c13d756..20d45d2 --- a/curses/prefs_curses.py +++ b/curses/prefs_curses.py @@ -29,8 +29,6 @@ wireless = None wired = None from wicd.translations import language -for i in language.keys(): - language[i] = language[i].decode('utf8') class PrefsDialog(urwid.WidgetWrap): def __init__(self,body,pos,ui,dbus=None): diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py old mode 100644 new mode 100755 index 71b2319..323d7e8 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -866,7 +866,6 @@ def main(): # Import the screen based on whatever the user picked. # The raw_display will have some features that may be useful to users # later - parser.set_defaults(screen='raw') if options.screen == 'raw': import urwid.raw_display ui = urwid.raw_display.Screen() @@ -955,7 +954,6 @@ setup_dbus() ######################################## if __name__ == '__main__': parser = OptionParser(version="wicd-curses-%s (using wicd %s)" % (CURSES_REVNO,daemon.Hello())) - # raw = True. curses = False parser.set_defaults(screen='raw') parser.add_option("-r", "--raw-screen",action="store_const",const='raw' ,dest='screen',help="use urwid's raw screen controller (default)") diff --git a/wicd/translations.py b/wicd/translations.py index e9523b1..397236c 100644 --- a/wicd/translations.py +++ b/wicd/translations.py @@ -1,6 +1,5 @@ #!/usr/bin/env python # -* coding: utf-8 -*- -# ^^ why do I need this? # # Copyright (C) 2007 - 2009 Adam Blackburn