[Checkins] SVN: grok/trunk/ template directories are now <modulename>_templates

[Martijn Faassen]

Log message for revision 70864:
  template directories are now <modulename>_templates
  

Changed:
  D   grok/trunk/grokwiki/src/grokwiki/page/
  A   grok/trunk/grokwiki/src/grokwiki/page_templates/
  U   grok/trunk/src/grok/_grok.py
  D   grok/trunk/src/grok/tests/error/filesystemtemplate/
  U   grok/trunk/src/grok/tests/error/filesystemtemplate.py
  A   grok/trunk/src/grok/tests/error/filesystemtemplate_templates/
  D   grok/trunk/src/grok/tests/scan/stoneage/hunt/mammoth/
  A   grok/trunk/src/grok/tests/scan/stoneage/hunt/mammoth_templates/
  D   grok/trunk/src/grok/tests/view/dirandinlinetemplate/
  U   grok/trunk/src/grok/tests/view/dirandinlinetemplate.py
  A   grok/trunk/src/grok/tests/view/dirandinlinetemplate_templates/
  D   grok/trunk/src/grok/tests/view/dirtemplate/
  A   grok/trunk/src/grok/tests/view/dirtemplate_templates/
  D   grok/trunk/src/grok/tests/view/dirtemplateandrender/
  A   grok/trunk/src/grok/tests/view/dirtemplateandrender_templates/
  D   grok/trunk/src/grok/tests/view/dirtemplatesonly/
  U   grok/trunk/src/grok/tests/view/dirtemplatesonly.py
  A   grok/trunk/src/grok/tests/view/dirtemplatesonly_templates/

-=-
Copied: grok/trunk/grokwiki/src/grokwiki/page_templates (from rev 70863, grok/trunk/grokwiki/src/grokwiki/page)

Modified: grok/trunk/src/grok/_grok.py
===================================================================
--- grok/trunk/src/grok/_grok.py	2006-10-21 14:15:15 UTC (rev 70863)
+++ grok/trunk/src/grok/_grok.py	2006-10-21 15:36:09 UTC (rev 70864)
@@ -154,8 +154,9 @@
             components[grok.Traverser], templates, subscribers)
 
 def find_filesystem_templates(module_info, templates):
-    template_dir_name = module_info.getAnnotation('grok.templatedir',
-                                                  module_info.name)
+    template_dir_name = module_info.getAnnotation(
+        'grok.templatedir',
+        module_info.name + '_templates')
     template_dir = module_info.getResourcePath(template_dir_name)
     if os.path.isdir(template_dir):
         template_files = os.listdir(template_dir)

Modified: grok/trunk/src/grok/tests/error/filesystemtemplate.py
===================================================================
--- grok/trunk/src/grok/tests/error/filesystemtemplate.py	2006-10-21 14:15:15 UTC (rev 70863)
+++ grok/trunk/src/grok/tests/error/filesystemtemplate.py	2006-10-21 15:36:09 UTC (rev 70864)
@@ -5,7 +5,7 @@
 
   >>> grok.grok(__name__)
   Traceback (most recent call last):
-  GrokError: No module-level context for <nocontext template in ...grok/tests/error/filesystemtemplate/nocontext.pt>, please use grok.context.
+  GrokError: No module-level context for <nocontext template in ...grok/tests/error/filesystemtemplate_templates/nocontext.pt>, please use grok.context.
 
 """
 import grok

Copied: grok/trunk/src/grok/tests/error/filesystemtemplate_templates (from rev 70863, grok/trunk/src/grok/tests/error/filesystemtemplate)

Copied: grok/trunk/src/grok/tests/scan/stoneage/hunt/mammoth_templates (from rev 70863, grok/trunk/src/grok/tests/scan/stoneage/hunt/mammoth)

Modified: grok/trunk/src/grok/tests/view/dirandinlinetemplate.py
===================================================================
--- grok/trunk/src/grok/tests/view/dirandinlinetemplate.py	2006-10-21 14:15:15 UTC (rev 70863)
+++ grok/trunk/src/grok/tests/view/dirandinlinetemplate.py	2006-10-21 15:36:09 UTC (rev 70864)
@@ -7,7 +7,7 @@
     ...
   GrokError: Conflicting templates found for name 'cavepainting' in module
   <module 'grok.tests.view.dirandinlinetemplate' from '...'>,
-  both inline and in template directory '...dirandinlinetemplate'.
+  both inline and in template directory '...dirandinlinetemplate_templates'.
 
 """
 import grok

Copied: grok/trunk/src/grok/tests/view/dirandinlinetemplate_templates (from rev 70863, grok/trunk/src/grok/tests/view/dirandinlinetemplate)

Copied: grok/trunk/src/grok/tests/view/dirtemplate_templates (from rev 70863, grok/trunk/src/grok/tests/view/dirtemplate)

Copied: grok/trunk/src/grok/tests/view/dirtemplateandrender_templates (from rev 70863, grok/trunk/src/grok/tests/view/dirtemplateandrender)

Modified: grok/trunk/src/grok/tests/view/dirtemplatesonly.py
===================================================================
--- grok/trunk/src/grok/tests/view/dirtemplatesonly.py	2006-10-21 14:15:15 UTC (rev 70863)
+++ grok/trunk/src/grok/tests/view/dirtemplatesonly.py	2006-10-21 15:36:09 UTC (rev 70864)
@@ -4,7 +4,7 @@
   >>> grok.grok(__name__)
   Traceback (most recent call last):
     ...
-  GrokError: Unrecognized file 'invalid.txt' in template directory '...dirtemplatesonly'.
+  GrokError: Unrecognized file 'invalid.txt' in template directory '...dirtemplatesonly_templates'.
 """
 import grok
 

Copied: grok/trunk/src/grok/tests/view/dirtemplatesonly_templates (from rev 70863, grok/trunk/src/grok/tests/view/dirtemplatesonly)