From 740204ee503ac394f07664e413b3d8db32172cc0 Mon Sep 17 00:00:00 2001
From: Andrew Psaltis <ampsaltis@gmail.com>
Date: Tue, 29 Sep 2009 12:38:11 -0400
Subject: [PATCH] Remove uses of ternary operator from wicd-curses, restoring
 support for python 2.4.

---
 curses/curses_misc.py | 18 ++++++++++++------
 curses/wicd-curses.py | 18 ++++++++++++++----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/curses/curses_misc.py b/curses/curses_misc.py
index f34afcb..e4e9e40 100644
--- a/curses/curses_misc.py
+++ b/curses/curses_misc.py
@@ -65,8 +65,11 @@ class DynWrap(urwid.AttrWrap):
     def __init__(self,w,sensitive=True,attrs=('editbx','editnfc'),focus_attr='editfc'):
         self._attrs=attrs
         self._sensitive = sensitive
-        
-        cur_attr = attrs[0] if sensitive else attrs[1]
+
+        if sensitive:
+            cur_attr = attrs[0]
+        else:
+            cur_attr = attrs[1]
 
         self.__super.__init__(w,cur_attr,focus_attr)
 
@@ -211,24 +214,27 @@ class TabColumns(urwid.WidgetWrap):
         return True
 
     def keypress(self,size,key):
+        # If the key is page up or page down, move focus to the tabs and call
+        # left or right on the tabs.
         if key == "page up" or key == "page down":
             self._w.get_body().set_focus(0)
-            newK = 'left' if key == "page up" else 'right'
+            if key == "page up":
+                newK = 'left'
+            else:
+                newK = 'right'
             self.keypress(size,newK)
             self._w.get_body().set_focus(1)
         else:
             key = self._w.keypress(size,key)
             wid = self.pile.get_focus().get_body()
             if wid == self.columns:
-            #    lw = self.listbox.body
-            #    lw.pop(1)
                 self.active_tab.set_attr('body')
                 self.columns.get_focus().set_attr('tab active')
                 self.active_tab = self.columns.get_focus()
                 self.gen_pile(self.tab_map[self.active_tab])
         
         return key
-        #    self.listbox.body = lw
+
     def mouse_event(self,size,event,button,x,y,focus):
         wid = self.pile.get_focus().get_body()
         if wid == self.columns:
diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py
index cacd5be..622560e 100755
--- a/curses/wicd-curses.py
+++ b/curses/wicd-curses.py
@@ -254,9 +254,14 @@ def help_dialog(body):
 
 def run_configscript(parent,netname,nettype):
     configfile = wpath.etc+netname+'-settings.conf'
-    header = 'profile' if nettype == 'wired' else 'BSSID'
-    profname = netname if nettype == 'wired' else wireless.GetWirelessProperty(
-            int(netname),'bssid')
+    if nettype != 'wired':
+        header = 'profile'
+    else:
+        header ='BSSID'
+    if nettype == 'wired':
+        profname = nettype
+    else:
+        profname = wireless.GetWirelessProperty( int(netname),'bssid')
     theText = [ 
             language['cannot_edit_scripts_1'].replace('$A',configfile).replace('$B',header),
 "\n\n["+profname+"]\n\n",
@@ -329,7 +334,12 @@ class NetLabel(urwid.WidgetWrap):
                 str(wireless.GetWirelessProperty(id, strenstr)))
         self.essid = wireless.GetWirelessProperty(id, 'essid')
         self.bssid = wireless.GetWirelessProperty(id, 'bssid')
-        self.encrypt = wireless.GetWirelessProperty(id,'encryption_method') if wireless.GetWirelessProperty(id, 'encryption') else language['unsecured']
+
+        if wireless.GetWirelessProperty(id, 'encryption'):
+            self.encrypt = wireless.GetWirelessProperty(id,'encryption_method')
+        else:
+            self.encrypt = language['unsecured']
+
         self.mode  = wireless.GetWirelessProperty(id, 'mode') # Master, Ad-Hoc
         self.channel = wireless.GetWirelessProperty(id, 'channel')
         theString = '  %-*s %25s %9s %17s %6s %4s' % (gap,