2to3 transformation

curses/curses_misc.py

@@ -25,6 +25,7 @@ wicd-curses.
 import urwid
 
 from wicd.translations import _
+from functools import reduce
 
 
 # Uses code that is towards the bottom
@@ -185,13 +186,12 @@ class MaskingEdit(urwid.Edit):
         """ Get masked out text. """
         return self.mask_char * len(self.get_edit_text())
 
-    def render(self, (maxcol, ), focus=False):
+    def render(self, xxx_todo_changeme, focus=False):
         """
         Render edit widget and return canvas.  Include cursor when in
         focus.
         """
-        # If we aren't masking anything ATM, then act like an Edit.
-        # No problems.
+        (maxcol, ) = xxx_todo_changeme
         if self.mask_mode == "off" or (self.mask_mode == 'no_focus' and focus):
             # pylint: disable-msg=E1101
             canv = self.__super.render((maxcol, ), focus)
@@ -235,7 +235,7 @@ class TabColumns(urwid.WidgetWrap):
             column_list.append(('fixed', len(text), w))
         column_list.append(urwid.Text((attrtitle, title), align='right'))
 
-        self.tab_map = dict(zip(tab_str, tab_wid))
+        self.tab_map = dict(list(zip(tab_str, tab_wid)))
         self.active_tab = tab_str[0]
         self.columns = urwid.Columns(column_list, dividechars=1)
         #walker = urwid.SimpleListWalker([self.columns, tab_wid[0]])
@@ -606,7 +606,7 @@ class Dialog2(urwid.WidgetWrap):
                             raise DialogExit(-1)
                         if k:
                             self.unhandled_key(size, k)
-        except DialogExit, e:
+        except DialogExit as e:
             return self.on_exit(e.args[0])
 
     def on_exit(self, exitcode):