[Checkins] SVN: lovely.recipe/branches/lovely-instance/s corrected imports

[Jodok Batlogg]

Log message for revision 79054:
  corrected imports

Changed:
  U   lovely.recipe/branches/lovely-instance/setup.py
  U   lovely.recipe/branches/lovely-instance/src/lovely/recipe/zope/zope.py

-=-
Modified: lovely.recipe/branches/lovely-instance/setup.py
===================================================================
--- lovely.recipe/branches/lovely-instance/setup.py	2007-08-20 21:56:56 UTC (rev 79053)
+++ lovely.recipe/branches/lovely-instance/setup.py	2007-08-20 22:06:00 UTC (rev 79054)
@@ -6,8 +6,8 @@
 mkfile = lovely.recipe.fs.mkfile:Mkfile
 i18n = lovely.recipe.i18n.i18n:I18n
 importchecker = lovely.recipe.importchecker.app:ImportChecker
-instance = lovely.recipe.zope:LovelyInstance
-app = lovely.recipe.zope:LovelyApp
+instance = lovely.recipe.zope.zope:LovelyInstance
+app = lovely.recipe.zope.zope:LovelyApp
 server = lovely.recipe.zeo:LovelyServer
 """
 
@@ -28,6 +28,7 @@
                         'zc.recipe.egg',
                         'zc.zope3recipes',
                         'zc.zodbrecipes',
+			'ZConfig'
                         ],
     entry_points = entry_points,
     zip_safe = True,

Modified: lovely.recipe/branches/lovely-instance/src/lovely/recipe/zope/zope.py
===================================================================
--- lovely.recipe/branches/lovely-instance/src/lovely/recipe/zope/zope.py	2007-08-20 21:56:56 UTC (rev 79053)
+++ lovely.recipe/branches/lovely-instance/src/lovely/recipe/zope/zope.py	2007-08-20 22:06:00 UTC (rev 79054)
@@ -23,14 +23,12 @@
 import zc.recipe.egg
 from zc.zope3recipes.recipes import (Instance,
                                      App,
-                                     ZConfigParse,
-                                     ZConfigSection,
                                      server_types,
                                      event_log2,
                                      this_loc,
                                      site_zcml_template)
+from ZConfig.cfgparser import ZConfigParser
 
-
 class TemplatedInstance:
 
     templatedOptions = []
@@ -209,7 +207,7 @@
 
     update = install
 
-class LovelyApp(App, TemplatedRecipe):
+class LovelyApp(App, TemplatedInstance):
 
     templatedOptions=['site.zcml']