[Checkins] SVN: grok/trunk/src/grok/ - unbreak the trunk, not cleaned up, just unbreak.

[Christian Theune]

Log message for revision 70753:
   - unbreak the trunk, not cleaned up, just unbreak.
  

Changed:
  U   grok/trunk/src/grok/_grok.py
  U   grok/trunk/src/grok/ftests/test_grok_functional.py
  U   grok/trunk/src/grok/scan.py

-=-
Modified: grok/trunk/src/grok/_grok.py
===================================================================
--- grok/trunk/src/grok/_grok.py	2006-10-17 15:14:02 UTC (rev 70752)
+++ grok/trunk/src/grok/_grok.py	2006-10-17 15:17:52 UTC (rev 70753)
@@ -91,10 +91,7 @@
                              provides=IDefaultViewName)
 
     package_or_module = resolve(dotted_name)
-    for name, path in scan.modules(dotted_name, package_or_module.__file__):
-        if is_package(name):
-            register_static_resources(name, path)
-
+    for name in scan.modules(dotted_name, package_or_module.__file__):
         grok_module(name)
 
 def grok_module(dotted_name):

Modified: grok/trunk/src/grok/ftests/test_grok_functional.py
===================================================================
--- grok/trunk/src/grok/ftests/test_grok_functional.py	2006-10-17 15:14:02 UTC (rev 70752)
+++ grok/trunk/src/grok/ftests/test_grok_functional.py	2006-10-17 15:17:52 UTC (rev 70753)
@@ -56,7 +56,7 @@
 
 def test_suite():
     suite = unittest.TestSuite()
-    for name in ['view', 'static']:
+    for name in ['view']:
         suite.addTest(suiteFromPackage(name))
     return suite
 

Modified: grok/trunk/src/grok/scan.py
===================================================================
--- grok/trunk/src/grok/scan.py	2006-10-17 15:14:02 UTC (rev 70752)
+++ grok/trunk/src/grok/scan.py	2006-10-17 15:17:52 UTC (rev 70753)
@@ -25,7 +25,7 @@
     if not (module_path.endswith('__init__.py')
             or module_path.endswith('__init__.pyc')):
         return
-    
+
     package_directory = os.path.dirname(module_path)
     seen = []
     for entry in sorted(os.listdir(package_directory)):