slightly modify start

mcdonc · Oct 8, 2011 · b7cbaed · b7cbaed
1 parent 0011609
commit b7cbaed
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 19 deletions.
diff --git a/memphis/view/customize.py b/memphis/view/customize.py
@@ -259,7 +259,8 @@ def initialize(*args):
 
     if chameleon_template:
         chameleon_template.AUTO_RELOAD = TEMPLATE.chameleon_reload
-        chameleon_template.BaseTemplateFile.auto_reload = TEMPLATE.chameleon_reload
+        chameleon_template.BaseTemplateFile.auto_reload = \
+            TEMPLATE.chameleon_reload
 
 
 @config.shutdownHandler

diff --git a/memphis/view/resources.py b/memphis/view/resources.py
@@ -86,26 +86,25 @@ def buildTree(path, not_allowed=re.compile('^[.~$#]')):
     return data
 
 
-@config.subscriber(config.SettingsInitializing)
+@config.subscriber(config.ApplicationStarting)
 def initialize(ev):
-    if ev.config is not None:
-        url = STATIC.url
-        if urlparse(url)[0]:
-            # it's a URL
-            STATIC.isurl = True
-            for name, data in registry.items():
-                dirs[name] = (0, urljoin(url, name))
+    url = STATIC.url
+    if urlparse(url)[0]:
+        # it's a URL
+        STATIC.isurl = True
+        for name, data in registry.items():
+            dirs[name] = (0, urljoin(url, name))
 
-        else:
-            for name, (abspath, pkg) in registry.items():
-                prefix = '%s/%s'%(url, name)
-                rname = '%s-%s'%(url, name)
-                pattern = '%s/*subpath'%prefix
-
-                ev.config.add_route(rname, pattern)
-                ev.config.add_view(
-                    route_name=rname,
-                    view=StaticView(abspath, buildTree(abspath), prefix))
+    else:
+        for name, (abspath, pkg) in registry.items():
+            prefix = '%s/%s'%(url, name)
+            rname = '%s-%s'%(url, name)
+            pattern = '%s/*subpath'%prefix
+
+            ev.config.add_route(rname, pattern)
+            ev.config.add_view(
+                route_name=rname,
+                view=StaticView(abspath, buildTree(abspath), prefix))
 
 
 class StaticView(object):

diff --git a/memphis/view/tests/base.py b/memphis/view/tests/base.py
@@ -30,6 +30,7 @@ def _init_memphis(self, settings={}, handler=None, *args, **kw):
         config.initialize(('memphis.view', self.__class__.__module__),
                           reg = Components('test'))
         config.initializeSettings(settings, self.p_config)
+        config.start(self.p_config)
 
     def _setup_pyramid(self):
         self.request = request = testing.DummyRequest()