From: Thierry Parmentelat Date: Mon, 23 May 2011 08:49:50 +0000 (+0200) Subject: use [ for ] instead of map - for smoother python3 X-Git-Tag: sface-0.1-10~14 X-Git-Url: http://git.onelab.eu/?p=sface.git;a=commitdiff_plain;h=ec0c86a2713a1c6fef16fbf5b4eecae7cae6f8e6;hp=0c8751587f38c9b3976233bdebce34dbd548085f use [ for ] instead of map - for smoother python3 --- diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py index 13140de..f1015b4 100644 --- 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) - 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)) diff --git a/sface/xmlrpcwindow.py b/sface/xmlrpcwindow.py index 483d443..a7be214 100644 --- 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 = 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 = ''