[gedit/gnome-3-8] Remove all uses of map() and filter(), instead use list comprehensions

[Garrett Regier <gregier src gnome org>]

commit 60306ff2a6b48ae6876fb1fab1e4ca76743c264e
Author: Garrett Regier <garrettregier gmail com>
Date:   Fri Jun 14 23:50:13 2013 -0700

    Remove all uses of map() and filter(), instead use list comprehensions
    
    Also, stop creating a pointless list just for str.join().

 plugins/externaltools/tools/library.py  |    2 +-
 plugins/snippets/snippets/completion.py |    4 ++--
 plugins/snippets/snippets/document.py   |    2 +-
 tools/generate-message.py               |   28 +++++++++++++++-------------
 4 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/plugins/externaltools/tools/library.py b/plugins/externaltools/tools/library.py
index 6efd03d..1e2a1aa 100644
--- a/plugins/externaltools/tools/library.py
+++ b/plugins/externaltools/tools/library.py
@@ -225,7 +225,7 @@ class Tool(object):
         if value.strip() == '':
             return []
         else:
-            return map(lambda x: x.strip(), value.split(','))
+            return [x.strip() for x in value.split(',')]
     
     def _from_list(self, value):
         return ','.join(value)
diff --git a/plugins/snippets/snippets/completion.py b/plugins/snippets/snippets/completion.py
index 69c7c38..d48a6a8 100644
--- a/plugins/snippets/snippets/completion.py
+++ b/plugins/snippets/snippets/completion.py
@@ -109,9 +109,9 @@ class Provider(GObject.Object, GtkSource.CompletionProvider):
 
                 # Filter based on the current word
                 if word:
-                        proposals = filter(lambda x: x['tag'].startswith(word), proposals)
+                        proposals = (x for x in proposals if x['tag'].startswith(word))
 
-                return list(map(lambda x: Proposal(x), proposals))
+                return [Proposal(x) for x in proposals]
 
         def do_populate(self, context):
                 proposals = self.get_proposals(self.get_word(context))
diff --git a/plugins/snippets/snippets/document.py b/plugins/snippets/snippets/document.py
index ccaf42d..fb14647 100644
--- a/plugins/snippets/snippets/document.py
+++ b/plugins/snippets/snippets/document.py
@@ -571,7 +571,7 @@ class Document(GObject.Object, Gedit.ViewActivatable, Signals):
                 self.active_snippets.append(sn)
 
                 # Put cursor at first tab placeholder
-                keys = list(filter(lambda x: x > 0, sn.placeholders.keys()))
+                keys = [x for x in sn.placeholders.keys() if x > 0]
 
                 if len(keys) == 0:
                         if 0 in sn.placeholders:
diff --git a/tools/generate-message.py b/tools/generate-message.py
index 6eb0b45..7c67cfd 100755
--- a/tools/generate-message.py
+++ b/tools/generate-message.py
@@ -56,18 +56,20 @@ class ParamSpec:
         argstr = ''
 
         if self.args:
-            ret = (",\n%s" % (indent,)).join(map(lambda x: str(x), self.args))
+            ret = (",\n%s" % (indent,)).join(str(x) for x in self.args)
             argstr = "\n%s%s," % (indent, ret)
 
+        flags = (' |\n%s' % (indent,)).join(x.strip() for x in self.flags.split('|'))
+
         return "%s (%s,\n%s%s,\n%s%s,%s\n%s%s)" % (name,
-                                                 self.format_str(self.name),
-                                                 indent,
-                                                 self.format_str(self.nick),
-                                                 indent,
-                                                 self.format_str(self.desc),
-                                                 argstr,
-                                                 indent,
-                                                 (' |\n%s' % (indent,)).join([x.strip() for x in 
self.flags.split('|')]))
+                                                   self.format_str(self.name),
+                                                   indent,
+                                                   self.format_str(self.nick),
+                                                   indent,
+                                                   self.format_str(self.desc),
+                                                   argstr,
+                                                   indent,
+                                                   flags)
 
     def write(self):
         delim = "\n" + (" " * 33)
@@ -88,7 +90,7 @@ class ParamSpecTyped(ParamSpec):
             parts = kwargs['gtype'].split('_')
             del parts[1]
 
-            self._ctype = '%s *' % (''.join([x.title() for x in parts]),)
+            self._ctype = '%s *' % (''.join(x.title() for x in parts),)
 
         self.args.append(kwargs['gtype'])
 
@@ -406,7 +408,7 @@ class Message:
         self.ns_upper = self.namespace.upper()
         self.ns_lower = self.namespace.lower()
 
-        self.name_upper = '_'.join([x.upper() for x in parts])
+        self.name_upper = '_'.join(x.upper() for x in parts)
         self.name_lower = self.name_upper.lower()
 
         self.cname_upper = '%s_%s' % (self.ns_upper, self.name_upper)
@@ -416,7 +418,7 @@ class Message:
         self.cclass = '%s%sClass' % (self.namespace, self.name)
 
         self.cobj = '%s%s' % (self.namespace, self.name)
-        self.filename = '%s-%s' % (self.ns_lower, '-'.join([x.lower() for x in parts]))
+        self.filename = '%s-%s' % (self.ns_lower, '-'.join(x.lower() for x in parts))
 
     def normalize_name(self, name):
         if not name:
@@ -425,7 +427,7 @@ class Message:
         return name.replace('_', '-')
 
     def parse_flags(self, flags):
-        return ' | '.join(['G_PARAM_' + x.strip().replace('-', '_').upper() for x in flags.split('|')])
+        return ' | '.join('G_PARAM_' + x.strip().replace('-', '_').upper() for x in flags.split('|'))
 
     def add_prop(self, elem):
         name = self.normalize_name(elem.get('name'))