Prepare map(), filter() and range() for py3

The builtin functions above have different returns in py3 - they become
"generators" instead of lists.

Took the oportunity to get rid of all map() usages and most of filter(),
they're generally less readable than list comprehensions or generator
expressions.

Changed most range() usages to xrange(). These are easily handled by
2to3.

This commit needs triple-checking since a lot of expressions were
modified.

Infernio: Took the opportunity to bring all copyListToClipboard usages
in line.

Author: Daniel Nunes

Mopy/bash/ScriptParser.py

@@ -770,7 +770,7 @@ def _emit(self, word=None, type_=None):
         # Try to figure out if it's multiple operators bunched together
         rightWord = None
         if type_ == UNKNOWN:
-            for idex in range(len(word),0,-1):
+            for idex in xrange(len(word),0,-1):
                 newType = getType(word[0:idex], self)
                 if newType != UNKNOWN:
                     rightWord = word[idex:]

Mopy/bash/_games_lo.py

@@ -1041,7 +1041,7 @@ def _fetch_load_order(self, cached_load_order, cached_active):
         if to_drop:
             # If we need to drop some mods, then make a backup first
             self._backup_load_order()
-            msg = (u'Removed ' + u' ,'.join(map(unicode, to_drop)) +
+            msg = (u'Removed ' + u' ,'.join(unicode(s) for s in to_drop) +
                    u' from %s')
         if not exists or to_drop:
             # In either case, write out the LO and deprint it
@@ -1110,7 +1110,7 @@ def parse_ccc_file(cls):
         _ccc_path = bass.dirs['app'].join(cls._ccc_filename)
         try:
             with open(_ccc_path.s, 'r') as ins:
-                lines = map(bolt.GPath, map(str.strip, ins.readlines()))
+                lines = (bolt.GPath(line.strip()) for line in ins.readlines())
                 cls.must_be_active_if_present += tuple(lines)
         except (OSError, IOError) as e:
             if e.errno != errno.ENOENT:

Mopy/bash/balt.py

@@ -337,7 +337,7 @@ def setCheckListItems(checkListBox, names, values):
                     continue
                 checkListBox.SetString(index, name)
             checkListBox.Check(index, value)
-        for index in range(checkListBox.GetCount(), len(names), -1):
+        for index in xrange(checkListBox.GetCount(), len(names), -1):
             checkListBox.Delete(index - 1)
 
 # Elements --------------------------------------------------------------------
@@ -518,7 +518,7 @@ def askOpen(parent,title=u'',defaultDir=u'',defaultFile=u'',wildcard=u'',style=w
     if dialog.ShowModal() != wx.ID_OK:
         result = False
     elif style & wx.FD_MULTIPLE:
-        result = map(GPath,dialog.GetPaths())
+        result = [GPath(path) for path in dialog.GetPaths()]
         if mustExist:
             for returned_path in result:
                 if not returned_path.exists():
@@ -1137,10 +1137,10 @@ def __OnDragging(self, event):
                 else:
                     left,right,step = oldPos+1,newPos+1,-1
                 insert = left+step
-                addPages = [(self.GetPage(x),self.GetPageText(x)) for x in range(left,right)]
+                addPages = [(self.GetPage(x),self.GetPageText(x)) for x in xrange(left,right)]
                 addPages.reverse()
                 num = right - left
-                for i in range(num):
+                for i in xrange(num):
                     self.RemovePage(left)
                 for page,title in addPages:
                     self.InsertPage(insert,page,title)
@@ -1385,7 +1385,7 @@ def OnBeginDrag(self, event):
 
         indexes = []
         start = stop = -1
-        for index in range(self.GetItemCount()):
+        for index in xrange(self.GetItemCount()):
             if self.GetItemState(index, wx.LIST_STATE_SELECTED):
                 if stop >= 0 and self.dndOnlyCont:
                     # Only allow moving selections if they are in a
@@ -1670,7 +1670,7 @@ def PopulateItem(self, itemDex=-1, item=None):
         else: # no way we're inserting with a None item
             item = self.GetItem(itemDex)
         cols = self.cols
-        for colDex in range(len(cols)):
+        for colDex in xrange(len(cols)):
             col = cols[colDex]
             labelTxt = self.labels[col](self, item)
             if insert and colDex == 0:
@@ -2718,7 +2718,7 @@ def __init__(self, parent, title, message, lists, liststyle='check',
                 checksCtrl.Bind(wx.EVT_KEY_UP,self.OnKeyUp)
                 checksCtrl.Bind(wx.EVT_CONTEXT_MENU,self.OnContext)
                 # check all - for range and set see wx._controls.CheckListBox
-                checksCtrl.SetChecked(set(range(len(strings))))
+                checksCtrl.SetChecked(set(xrange(len(strings))))
             elif liststyle == 'list':
                 checksCtrl = listBox(self, choices=strings, isHScroll=True)
             else:

Mopy/bash/basher/__init__.py

@@ -580,7 +580,7 @@ def ListTweaks(self):
     @staticmethod
     def filterOutDefaultTweaks(ini_tweaks):
         """Filter out default tweaks from tweaks iterable."""
-        return filter(lambda x: not bosh.iniInfos[x].is_default_tweak, ini_tweaks)
+        return [x for x in ini_tweaks if not bosh.iniInfos[x].is_default_tweak]
 
     def _toDelete(self, items):
         items = super(INIList, self)._toDelete(items)
@@ -806,7 +806,7 @@ def dndAllow(self, event):
             pinned = load_order.filter_pinned(self.GetSelected())
             if pinned:
                 msg = _(u"You can't reorder the following mods:\n" +
-                        u', '.join(map(unicode, pinned)))
+                        u', '.join(unicode(s) for s in pinned))
                 continue_key = 'bash.mods.dnd.pinned.continue'
         if msg:
             balt.askContinue(self, msg, continue_key)
@@ -979,8 +979,8 @@ def OnKeyUp(self,event):
             self._toggle_active_state(*toggle_target)
         # Ctrl+C: Copy file(s) to clipboard
         elif event.CmdDown() and code == ord('C'):
-            balt.copyListToClipboard([self.data_store[mod].getPath().s
-                                      for mod in self.GetSelected()])
+            balt.copyListToClipboard(self.data_store[mod].abs_path.s
+                                     for mod in self.GetSelected())
         super(ModList, self).OnKeyUp(event)
 
     def OnLeftDown(self,event):
@@ -1909,9 +1909,8 @@ def OnKeyUp(self,event):
         code = event.GetKeyCode()
         # Ctrl+C: Copy file(s) to clipboard
         if event.CmdDown() and code == ord('C'):
-            sel = map(lambda save: self.data_store[save].getPath().s,
-                      self.GetSelected())
-            balt.copyListToClipboard(sel)
+            balt.copyListToClipboard(self.data_store[save].abs_path.s
+                                     for save in self.GetSelected())
         super(SaveList, self).OnKeyUp(event)
 
     def OnLeftDown(self,event):
@@ -2486,9 +2485,8 @@ def OnKeyUp(self,event):
             self.addMarker()
         # Ctrl+C: Copy file(s) to clipboard
         elif event.CmdDown() and code == ord('C'):
-            sel = map(lambda x: bass.dirs['installers'].join(x).s,
-                      self.GetSelected())
-            balt.copyListToClipboard(sel)
+            balt.copyListToClipboard(bass.dirs['installers'].join(x).s
+                                     for x in self.GetSelected())
         super(InstallersList, self).OnKeyUp(event)
 
     # Installer specific ------------------------------------------------------
@@ -2836,7 +2834,7 @@ def OnCheckSubItem(self,event):
             installer.extras_dict['fomod_active'] = self.gSubList.IsChecked(0)
             self.gSubList.Delete(0)
             has_fomod = True
-        for index in range(self.gSubList.GetCount()):
+        for index in xrange(self.gSubList.GetCount()):
             installer.subActives[index+1] = self.gSubList.IsChecked(index)
         if has_fomod:
             self.gSubList.Insert("fomod", 0)
@@ -3138,9 +3136,8 @@ def OnKeyUp(self,event):
         code = event.GetKeyCode()
         # Ctrl+C: Copy file(s) to clipboard
         if event.CmdDown() and code == ord('C'):
-            sel = map(lambda x: bosh.screen_infos.store_dir.join(x).s,
-                      self.GetSelected())
-            balt.copyListToClipboard(sel)
+            balt.copyListToClipboard(self.data_store[screen].abs_path.s
+                                     for screen in self.GetSelected())
         super(ScreensList, self).OnKeyUp(event)
 
 #------------------------------------------------------------------------------
@@ -3412,7 +3409,7 @@ def Execute(self):
             iMods = None
             iInstallers = None
             iDelete = None
-            for i in range(Link.Frame.notebook.GetPageCount()):
+            for i in xrange(Link.Frame.notebook.GetPageCount()):
                 pageTitle = Link.Frame.notebook.GetPageText(i)
                 if pageTitle == tabInfo['Mods'][1]:
                     iMods = i
@@ -3658,7 +3655,7 @@ def UnhideButton(self,link):
             self._addButton(link)
             button = self.buttons.pop()
             thisIndex, insertBefore = order.index(link.uid), 0
-            for i in range(len(self.buttons)):
+            for i in xrange(len(self.buttons)):
                 otherlink = self.GetLink(index=i)
                 indexOther = order.index(otherlink.uid)
                 if indexOther > thisIndex:

Mopy/bash/basher/frames.py

@@ -475,7 +475,7 @@ def DoSave(self):
         maVersion = re.match(u'' r'(\d+)\.(\d+)',
                              self.gVersion.text_content.strip(), flags=re.U)
         if maVersion:
-            config.vMajor,config.vMinor = map(int,maVersion.groups())
+            config.vMajor,config.vMinor = (int(g) for g in maVersion.groups())
         else:
             config.vMajor,config.vMinor = (0,0)
         #--Done

Mopy/bash/basher/gui_patchers.py

@@ -24,7 +24,6 @@
 from __future__ import division
 import copy
 import re
-from operator import itemgetter
 import wx
 # Internal
 from .. import bass, bosh, bush, balt, load_order, bolt, exception
@@ -176,7 +175,7 @@ def OnEditAliases(self):
         aliases_text = self.gAliases.text_content
         self.aliases.clear()
         for line in aliases_text.split(u'\n'):
-            fields = map(unicode.strip,line.split(u'>>'))
+            fields = [s.strip() for s in line.split(u'>>')]
             if len(fields) != 2 or not fields[0] or not fields[1]: continue
             self.aliases[GPath(fields[0])] = GPath(fields[1])
         self.SetAliasText()
@@ -187,7 +186,7 @@ def getConfig(self, configs):
         config = super(_AliasesPatcherPanel, self).getConfig(configs)
         #--Update old configs to use Paths instead of strings.
         self.aliases = dict(# map(GPath, item) gives a list (item is a tuple)
-            map(GPath, item) for item in
+            [GPath(i) for i in item] for item in
             config.get('aliases', self.__class__.default_aliases).iteritems())
         return config
 
@@ -815,7 +814,7 @@ def _get_set_choice(self, item):
 
     def getItemLabel(self,item):
         """Returns label for item to be used in list"""
-        choice = map(itemgetter(0),self.configChoices.get(item,tuple()))
+        choice = [i[0] for i in self.configChoices.get(item, tuple())]
         item  = u'%s' % item # Path or basestring - YAK
         if choice:
             return u'%s [%s]' % (item,u''.join(sorted(choice)))

Mopy/bash/basher/installer_links.py

@@ -507,8 +507,10 @@ class Installer_Hide(_InstallerLink, UIList_Hide):
                                   u'selected.')
 
     def _enable(self):
-        return not any(map(lambda inf: isinstance(inf, bosh.InstallerMarker),
-                       self.iselected_infos()))
+        for info in self.iselected_infos():
+            if isinstance(info, bosh.InstallerMarker):
+                return False
+        return True
 
 class Installer_Rename(UIList_Rename, _InstallerLink):
     """Renames files by pattern."""
@@ -518,8 +520,10 @@ class Installer_Rename(UIList_Rename, _InstallerLink):
     def _enable(self):
         ##Only enable if all selected items are of the same type
         firstItem = next(self.iselected_infos())
-        return all(map(lambda inf: isinstance(inf, type(firstItem)),
-                       self.iselected_infos()))
+        for info in self.iselected_infos():
+            if not isinstance(info, type(firstItem)):
+                return False
+        return True
 
 class Installer_HasExtraData(CheckLink, _RefreshingLink):
     """Toggle hasExtraData flag on installer."""
@@ -906,7 +910,7 @@ class Installer_Espm_SelectAll(_Installer_Details_Link):
 
     def Execute(self):
         self._installer.espmNots = set()
-        for i in range(len(self.window.espms)):
+        for i in xrange(len(self.window.espms)):
             self.window.gEspmList.Check(i, True)
         self.window.refreshCurrent(self._installer)
 
@@ -917,7 +921,7 @@ class Installer_Espm_DeselectAll(_Installer_Details_Link):
 
     def Execute(self):
         espmNots = self._installer.espmNots = set()
-        for i in range(len(self.window.espms)):
+        for i in xrange(len(self.window.espms)):
             self.window.gEspmList.Check(i, False)
             espm =GPath(self.window.gEspmList.GetString(i).replace(u'&&',u'&'))
             espmNots.add(espm)
@@ -981,7 +985,7 @@ def Execute(self):
         subs = (_(u'Plugin List for %s:') % self._installer.archive +
                 u'\n[spoiler]\n')
         espm_list = self.window.gEspmList
-        for index in range(espm_list.GetCount()):
+        for index in xrange(espm_list.GetCount()):
             subs += [u'   ',u'** '][espm_list.IsChecked(index)] + \
                     espm_list.GetString(index) + '\n'
         subs += u'[/spoiler]'
@@ -1095,8 +1099,10 @@ class InstallerArchive_Unpack(AppendableLink, _InstallerLink):
     def _append(self, window):
         self.selected = window.GetSelected() # append runs before _initData
         self.window = window # and the idata access is via self.window
-        return all(map(lambda inf: isinstance(inf, bosh.InstallerArchive),
-                       self.iselected_infos()))
+        for info in self.iselected_infos():
+            if not isinstance(info, bosh.InstallerArchive):
+                return False
+        return True
 
     @balt.conversation
     def Execute(self):

Mopy/bash/basher/installers_links.py

@@ -86,7 +86,7 @@ def Execute(self):
         with load_order.Unlock():
             mods_changed = bosh.modInfos.refresh()
         inis_changed = bosh.iniInfos.refresh()
-        ui_refresh = map(bool, [mods_changed, inis_changed])
+        ui_refresh = (bool(mods_changed), bool(inis_changed))
         self.iPanel.ShowPanel(canCancel=False, scan_data_dir=True)
         # Determine changes
         curData = self.idata.data_sizeCrcDate

Mopy/bash/basher/links.py

@@ -701,7 +701,7 @@ def InitScreenLinks():
     #--JPEG Quality
     if True:
         qualityMenu = MenuLink(_(u'JPEG Quality'))
-        for i in range(100, 80, -5):
+        for i in xrange(100, 80, -5):
             qualityMenu.links.append(Screens_JpgQuality(i))
         qualityMenu.links.append(Screens_JpgQualityCustom())
         ScreensList.mainMenu.append(SeparatorLink())

Mopy/bash/bolt.py

@@ -531,7 +531,7 @@ def csbody(self):
     @property
     def headTail(self):
         """For alpha\beta.gamma returns (alpha,beta.gamma)"""
-        return map(GPath,(self.shead,self.stail))
+        return [GPath(self.shead), GPath(self.stail)]
     @property
     def head(self):
         """For alpha\beta.gamma, returns alpha."""
@@ -623,7 +623,7 @@ def size(self):
             join = os.path.join
             getSize = os.path.getsize
             try:
-                return sum([sum(map(getSize,map(lambda z: join(x,z),files))) for x,y,files in _walk(self._s)])
+                return sum(sum(getSize(join(x, f)) for f in files) for x, _, files in _walk(self._s))
             except ValueError:
                 return 0
         else:
@@ -1196,8 +1196,8 @@ def __len__(self): return sum(self.mask)
     def __iter__(self):
         for i,elem in enumerate(self.items):
             if self.mask[i]: yield self.items[i]
-    def __str__(self): return u'{%s}' % (','.join(map(repr,self._items())))
-    def __repr__(self): return u'MemorySet([%s])' % (','.join(map(repr,self._items())))
+    def __str__(self): return u'{%s}' % (','.join(repr(i) for i in self._items()))
+    def __repr__(self): return u'MemorySet([%s])' % (','.join(repr(i) for i in self._items()))
     def forget(self, elem):
         # Permanently remove an item from the list.  Don't remember its order
         if elem in self.items:
@@ -2082,7 +2082,7 @@ def genHtml(ins,out=None,*cssDirs):
         # Setup
         outWrite = out.write
 
-        cssDirs = map(GPath,cssDirs)
+        cssDirs = (GPath(d) for d in cssDirs)
         # Setup ---------------------------------------------------------
         #--Headers
         reHead = re.compile(u'(=+) *(.+)',re.U)