git://git.onelab.eu / sface.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 0c87515)
use [ for ] instead of map - for smoother python3
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 23 May 2011 08:49:50 +0000 (10:49 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 23 May 2011 08:49:50 +0000 (10:49 +0200)
sface/screens/mainscreen.py patch | blob | history
sface/xmlrpcwindow.py patch | blob | history

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index 13140de..f1015b4 100644 (file)
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -391,7 +391,7 @@ class SliceWidget(QWidget):
 
             all_nodes = rspec.get_node_list(network)
             sliver_nodes = rspec.get_sliver_list(network)
 
             all_nodes = rspec.get_node_list(network)
             sliver_nodes = rspec.get_sliver_list(network)
-            available_nodes = filter(lambda x:x not in sliver_nodes, all_nodes)
+            available_nodes = [ node for node in all_nodes if node not in sliver_nodes ]
 
             networkItem = QStandardItem(QString(network))
             msg = "%s Nodes\t%s Selected" % (len(all_nodes), len(sliver_nodes))
 
             networkItem = QStandardItem(QString(network))
             msg = "%s Nodes\t%s Selected" % (len(all_nodes), len(sliver_nodes))
diff --git a/sface/xmlrpcwindow.py b/sface/xmlrpcwindow.py
index 483d443..a7be214 100644 (file)
--- a/sface/xmlrpcwindow.py
+++ b/sface/xmlrpcwindow.py
@@ -27,8 +27,8 @@ class XmlrpcTracker():
         answers = re.compile(pttrnAsk, re.DOTALL).findall(self.rawOutput)
         replies = re.compile(pttrnAns, re.DOTALL).findall(self.rawOutput)
         # cleaning
         answers = re.compile(pttrnAsk, re.DOTALL).findall(self.rawOutput)
         replies = re.compile(pttrnAns, re.DOTALL).findall(self.rawOutput)
         # cleaning
-        answers = map(lambda x: x.replace('\\n','\n'), answers)
-        replies = map(lambda x: x.replace('\\n','\n').replace("'\nbody: '", ''), replies)
+        answers = [ x.replace('\\n','\n') for x in answers ]
+        replies = [ x.replace('\\n','\n').replace("'\nbody: '", '') for x in replies ]
         replies.reverse() # so that I use pop() as popleft
         # A well-formed XML document must have one, and only one, top-level element
         self.xml = '<debug>'
         replies.reverse() # so that I use pop() as popleft
         # A well-formed XML document must have one, and only one, top-level element
         self.xml = '<debug>'
sface