[Checkins] SVN: z3c.caching/trunk/src/z3c/caching/zcml.py We can't really use getGlobalRegistry() until the adapter has been registered, so delay that lookup

[Martin Aspeli]

Log message for revision 107587:
  We can't really use getGlobalRegistry() until the adapter has been registered, so delay that lookup

Changed:
  U   z3c.caching/trunk/src/z3c/caching/zcml.py

-=-
Modified: z3c.caching/trunk/src/z3c/caching/zcml.py
===================================================================
--- z3c.caching/trunk/src/z3c/caching/zcml.py	2010-01-03 15:05:37 UTC (rev 107586)
+++ z3c.caching/trunk/src/z3c/caching/zcml.py	2010-01-03 15:19:52 UTC (rev 107587)
@@ -17,18 +17,24 @@
             required=True)
 
 def rulesetType(_context, name, title, description=u""):
-    declareType = getGlobalRulesetRegistry().declareType
     _context.action(
             discriminator=("declareCacheRuleSetType", name),
             callable=declareType,
             args=(name, title, description,),
-            order=-10)
+            order=10)
 
 
 def ruleset(_context, for_, ruleset):
-    register = getGlobalRulesetRegistry().register
     _context.action(
             discriminator=("registerCacheRule", for_),
             callable=register,
             args=(for_, ruleset,),
-            order=10)
+            order=20)
+
+# Handlers
+
+def declareType(name, title, description):
+    getGlobalRulesetRegistry().declareType(name, title, description)
+
+def register(for_, ruleset):
+    getGlobalRulesetRegistry().register(for_, ruleset)