Changeset 1916

Timestamp:

08/30/08 18:52:49 (3 months ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/ChangeLog (modified) (1 diff)
• cherokee/trunk/admin/config.py (modified) (1 diff)

cherokee/trunk/ChangeLog

@@ -1 +1 @@
-2008-08-30  Alvaro Lopez Ortega  <alvaro@alobbs.com>
+
+        * admin/config.py: Adds a couple of convenience methods and
+        improves the serialization.
-
-        * admin/ModuleCgi.py, admin/ModuleFcgi.py, admin/ModuleScgi.py:

cherokee/trunk/admin/config.py

@@ -232 +232 @@
-            del (parent._child[child_name])
-
+    def keys (self, path):
+        tmp = self[path]
+        if not tmp:
+            return []
+        return tmp.keys()
+
+    def pop (self, key):
+        tmp = self.get_val(key)
+        del (self[key])
+        return tmp
+
-    # Serialization
-    def serialize (self):
-        def sorter(x,y):
-            order = ['server', 'vserver', 'icons', 'mime']
-[0]
-[0]
+
+
-            try:
-
-
+[0]
+[0]
-            except:
-                return cmp(x,y)
+
+            # Different tags
-            if ai > bi:
-                return  1
-            elif ai < bi:
-                return -1
+
+            # Sort rules: reverse
+            if ((len(a) > 3) and 
+                (a[0] == b[0] == 'vserver') and
+                (a[2] == b[2] == 'rule')):
+                return cmp (int(b[3]), int(a[3]))
+
-            return cmp(x,y)
-