Merge branch 'master' of ssh://git.planet-lab.org/git/sfa

diff --git a/sfa/trust/trustedroot.py b/sfa/trust/trustedroot.py
index 2cd4f3b..364704e 100644 (file)
--- a/sfa/trust/trustedroot.py
+++ b/sfa/trust/trustedroot.py
@@ -15,22 +15,12 @@ class TrustedRootList:
         gid.save_to_file(fn)
 
     def get_list(self):
-        gid_list = []
-        pattern=os.path.join(self.basedir,"*.gid")
-        gid_files = glob.glob(pattern)
-        for gid_file in gid_files:
-            # ignore non-files
-            if os.path.isfile(gid_file):
-                gid = GID(filename = gid_file)
-                gid_list.append(gid)
+        gid_list = [GID(filename=cert_file) for cert_file in self.get_file_list()]
         return gid_list
 
     def get_file_list(self):
-        gid_file_list = []
-        pattern=os.path.join(self.basedir,"*.gid")
-        gid_files = glob.glob(pattern)
-        for gid_file in gid_files:
-            # ignore non-files
-            if os.path.isfile(gid_file):
-                gid_file_list.append(gid_file)        
-        return gid_file_list
+        file_list  = []
+        for cert_file in os.listdir(self.basedir):
+            if os.path.isfile(cert_file):
+                file_list.append(os.path.join(self.basedir, cert_file)) 
+        return file_list

diff --git a/sfa/util/enumeration.py b/sfa/util/enumeration.py
new file mode 100644 (file)
index 0000000..4e508bd
--- /dev/null
+++ b/sfa/util/enumeration.py
@@ -0,0 +1,13 @@
+
+class Enum(set):
+    def __init__(self, *args, **kwds):
+        set.__init__(self)
+        enums = dict(zip(args, [object() for i in range(len(args))]), **kwds)
+        for (key, value) in enums.items():
+            setattr(self, key, value)
+            self.add(eval('self.%s' % key))
+
+
+#def Enum2(*args, **kwds):
+#    enums = dict(zip(sequential, range(len(sequential))), **named)
+#    return type('Enum', (), enums)