[Checkins] SVN: grok/trunk/src/grok/ test that the 'static' directory can not be a python package

[Wolfgang Schnerring]

Log message for revision 70775:
  test that the 'static' directory can not be a python package

Changed:
  U   grok/trunk/src/grok/_grok.py
  A   grok/trunk/src/grok/tests/static/
  A   grok/trunk/src/grok/tests/static/__init__.py
  A   grok/trunk/src/grok/tests/static/staticispackage.py
  A   grok/trunk/src/grok/tests/static/staticispackage_fixture/
  A   grok/trunk/src/grok/tests/static/staticispackage_fixture/__init__.py
  A   grok/trunk/src/grok/tests/static/staticispackage_fixture/static/
  A   grok/trunk/src/grok/tests/static/staticispackage_fixture/static/__init__.py
  U   grok/trunk/src/grok/tests/test_grok.py

-=-
Modified: grok/trunk/src/grok/_grok.py
===================================================================
--- grok/trunk/src/grok/_grok.py	2006-10-18 10:42:37 UTC (rev 70774)
+++ grok/trunk/src/grok/_grok.py	2006-10-18 10:56:24 UTC (rev 70775)
@@ -128,6 +128,9 @@
 
     resource_path = module_info.getResourcePath('static')
     if os.path.isdir(resource_path):
+        if scan.is_package(resource_path):
+            raise GrokError("The 'static' resource directory must not "
+                            "be a python package.", module_info.getModule())
         register_static_resources(module_info.dotted_name, resource_path)
 
     for sub_module_info in module_info.getSubModuleInfos():
@@ -135,7 +138,8 @@
 
 
 def grok_module(module_info):
-    models, adapters, multiadapters, views, templates, subscribers = scan_module(module_info)
+    (models, adapters, multiadapters,
+     views, templates, subscribers) = scan_module(module_info)
 
     find_filesystem_templates(module_info, templates)
 

Added: grok/trunk/src/grok/tests/static/__init__.py
===================================================================
--- grok/trunk/src/grok/tests/static/__init__.py	2006-10-18 10:42:37 UTC (rev 70774)
+++ grok/trunk/src/grok/tests/static/__init__.py	2006-10-18 10:56:24 UTC (rev 70775)
@@ -0,0 +1 @@
+# this is a package

Added: grok/trunk/src/grok/tests/static/staticispackage.py
===================================================================
--- grok/trunk/src/grok/tests/static/staticispackage.py	2006-10-18 10:42:37 UTC (rev 70774)
+++ grok/trunk/src/grok/tests/static/staticispackage.py	2006-10-18 10:56:24 UTC (rev 70775)
@@ -0,0 +1,9 @@
+"""
+It is an error for the 'static' directory to be a python package:
+
+  >>> import grok
+  >>> grok.grok('grok.tests.static.staticispackage_fixture')
+  Traceback (most recent call last):
+    ...
+  GrokError: The 'static' resource directory must not be a python package.
+"""

Added: grok/trunk/src/grok/tests/static/staticispackage_fixture/__init__.py
===================================================================
--- grok/trunk/src/grok/tests/static/staticispackage_fixture/__init__.py	2006-10-18 10:42:37 UTC (rev 70774)
+++ grok/trunk/src/grok/tests/static/staticispackage_fixture/__init__.py	2006-10-18 10:56:24 UTC (rev 70775)
@@ -0,0 +1 @@
+# this is a package

Added: grok/trunk/src/grok/tests/static/staticispackage_fixture/static/__init__.py
===================================================================
--- grok/trunk/src/grok/tests/static/staticispackage_fixture/static/__init__.py	2006-10-18 10:42:37 UTC (rev 70774)
+++ grok/trunk/src/grok/tests/static/staticispackage_fixture/static/__init__.py	2006-10-18 10:56:24 UTC (rev 70775)
@@ -0,0 +1 @@
+# this is a package

Modified: grok/trunk/src/grok/tests/test_grok.py
===================================================================
--- grok/trunk/src/grok/tests/test_grok.py	2006-10-18 10:42:37 UTC (rev 70774)
+++ grok/trunk/src/grok/tests/test_grok.py	2006-10-18 10:56:24 UTC (rev 70775)
@@ -33,7 +33,7 @@
 def test_suite():
     suite = unittest.TestSuite()
     for name in ['adapter', 'error', 'view', 'security', 'scan',
-                 'event', 'zcml']:
+                 'event', 'zcml', 'static']:
         suite.addTest(suiteFromPackage(name))
     return suite