[Checkins] SVN: grok/trunk/src/grok/ - renamed directive 'resource' to 'resources'

Christian Theune ct at gocept.com
Mon Oct 16 12:17:40 EDT 2006


Log message for revision 70711:
   - renamed directive 'resource' to 'resources'
  

Changed:
  U   grok/trunk/src/grok/__init__.py
  U   grok/trunk/src/grok/_grok.py
  U   grok/trunk/src/grok/tests/view/resourcedirectory.py

-=-
Modified: grok/trunk/src/grok/__init__.py
===================================================================
--- grok/trunk/src/grok/__init__.py	2006-10-16 16:17:09 UTC (rev 70710)
+++ grok/trunk/src/grok/__init__.py	2006-10-16 16:17:39 UTC (rev 70711)
@@ -17,4 +17,4 @@
 from zope.interface import implements
 from zope.component import adapts
 from _grok import (Model, Adapter, MultiAdapter, View, PageTemplate,
-                   grok, context, name, template, resource)
+                   grok, context, name, template, resources)

Modified: grok/trunk/src/grok/_grok.py
===================================================================
--- grok/trunk/src/grok/_grok.py	2006-10-16 16:17:09 UTC (rev 70710)
+++ grok/trunk/src/grok/_grok.py	2006-10-16 16:17:39 UTC (rev 70711)
@@ -32,6 +32,7 @@
                             ClassOrModuleDirectiveContext,
                             TextDirective, InterfaceOrClassDirective)
 
+
 class Model(persistent.Persistent):
     pass
 
@@ -105,7 +106,7 @@
 
     # find filesystem resources
     module_name = dotted_name.split('.')[-1]
-    directory_name = directive_annotation(module, 'grok.resource', module_name)
+    directory_name = directive_annotation(module, 'grok.resources', module_name)
     if resource_exists(dotted_name, directory_name):
         resources = resource_listdir(dotted_name, directory_name)
         for resource in resources:
@@ -256,4 +257,4 @@
 template = TextDirective('grok.template', ClassDirectiveContext())
 context = InterfaceOrClassDirective('grok.context',
                                     ClassOrModuleDirectiveContext())
-resource = TextDirective('grok.resource', ModuleDirectiveContext())
+resources = TextDirective('grok.resources', ModuleDirectiveContext())

Modified: grok/trunk/src/grok/tests/view/resourcedirectory.py
===================================================================
--- grok/trunk/src/grok/tests/view/resourcedirectory.py	2006-10-16 16:17:09 UTC (rev 70710)
+++ grok/trunk/src/grok/tests/view/resourcedirectory.py	2006-10-16 16:17:39 UTC (rev 70711)
@@ -1,5 +1,5 @@
 """
-You can explicitly specify the resource directory using grok.resource on module level:
+You can explicitly specify the resource directory using grok.resources on module level:
 
   >>> grok.grok(__name__)
 
@@ -18,7 +18,7 @@
 """
 import grok
 
-grok.resource('resourcedirectoryname')
+grok.resources('resourcedirectoryname')
 
 class Mammoth(grok.Model):
     pass



More information about the Checkins mailing list