get rid of svn keywords once and for good

[plcapi.git] / PLC / Methods / GetPeerData.py

diff --git a/PLC/Methods/GetPeerData.py b/PLC/Methods/GetPeerData.py
index 213113b..b220f18 100644 (file)
--- a/PLC/Methods/GetPeerData.py
+++ b/PLC/Methods/GetPeerData.py
@@ -1,7 +1,6 @@
 #
 # Thierry Parmentelat - INRIA
 #
 # Thierry Parmentelat - INRIA

-# 
-# $Id$
+#

 
 import time
 
 
 import time
 


@@ -25,7 +24,7 @@ class GetPeerData(Method):
     database as foreign objects. Also returns the list of foreign
     nodes in this database, for which the calling peer is
     authoritative, to assist in synchronization of slivers.
     database as foreign objects. Also returns the list of foreign
     nodes in this database, for which the calling peer is
     authoritative, to assist in synchronization of slivers.

-    
+

     See the implementation of RefreshPeer for how this data is used.
     """
 
     See the implementation of RefreshPeer for how this data is used.
     """
 


@@ -46,31 +45,29 @@ class GetPeerData(Method):
         start = time.time()
 
         # Filter out various secrets
         start = time.time()
 
         # Filter out various secrets

-        node_fields = filter(lambda field: field not in \
-                             ['boot_nonce', 'key', 'session', 'root_person_ids'],
-                             Node.fields)
+        node_fields = [ field for field in Node.fields if field \
+                            not in ['boot_nonce', 'key', 'session', 'root_person_ids']]

         nodes = Nodes(self.api, {'peer_id': None}, node_fields);
         # filter out whitelisted nodes
         nodes = Nodes(self.api, {'peer_id': None}, node_fields);
         # filter out whitelisted nodes

-        nodes = [ n for n in nodes if not n['slice_ids_whitelist']] 
-        
+        nodes = [ n for n in nodes if not n['slice_ids_whitelist']]

 
 

-        person_fields = filter(lambda field: field not in \
-                               ['password', 'verification_key', 'verification_expires'],
-                               Person.fields)
+
+        person_fields = [ field for field in Person.fields if field \
+                              not in ['password', 'verification_key', 'verification_expires']]

 
         # XXX Optimize to return only those Persons, Keys, and Slices
         # necessary for slice creation on the calling peer's nodes.
 
 
         # XXX Optimize to return only those Persons, Keys, and Slices
         # necessary for slice creation on the calling peer's nodes.
 

-       # filter out special person
-       persons = Persons(self.api, {'~email':[self.api.config.PLC_API_MAINTENANCE_USER,
-                                              self.api.config.PLC_ROOT_USER],
-                                    'peer_id': None}, person_fields)
+        # filter out special person
+        persons = Persons(self.api, {'~email':[self.api.config.PLC_API_MAINTENANCE_USER,
+                                               self.api.config.PLC_ROOT_USER],
+                                     'peer_id': None}, person_fields)

 
 

-       # filter out system slices
+        # filter out system slices

         system_slice_ids = SliceTags(self.api, {'name': 'system', 'value': '1'}).dict('slice_id')
         system_slice_ids = SliceTags(self.api, {'name': 'system', 'value': '1'}).dict('slice_id')

-       slices = Slices(self.api, {'peer_id': None,
-                                  '~slice_id':system_slice_ids.keys()})
-       
+        slices = Slices(self.api, {'peer_id': None,
+                                   '~slice_id':system_slice_ids.keys()})
+

         result = {
             'Sites': Sites(self.api, {'peer_id': None}),
             'Keys': Keys(self.api, {'peer_id': None}),
         result = {
             'Sites': Sites(self.api, {'peer_id': None}),
             'Keys': Keys(self.api, {'peer_id': None}),