[Checkins] SVN: megrok.nozodb/trunk/s added patch from gwik

[Christian Klinger]

Log message for revision 118761:
  added patch from gwik

Changed:
  U   megrok.nozodb/trunk/setup.py
  U   megrok.nozodb/trunk/src/megrok/nozodb/components.py
  U   megrok.nozodb/trunk/src/megrok/nozodb/nozodb.py
  U   megrok.nozodb/trunk/src/megrok/nozodb/utils.py

-=-
Modified: megrok.nozodb/trunk/setup.py
===================================================================
--- megrok.nozodb/trunk/setup.py	2010-12-09 08:52:20 UTC (rev 118760)
+++ megrok.nozodb/trunk/setup.py	2010-12-09 13:02:40 UTC (rev 118761)
@@ -7,7 +7,7 @@
 long_description = open(readme_filename).read() + '\n\n' + \
                    open(os.path.join('docs', 'HISTORY.txt')).read()
 
-test_requires = ['zope.app.wsgi',]
+test_requires = ['zope.app.wsgi', 'grok']
 
 setup(name='megrok.nozodb',
       version=version,
@@ -31,7 +31,9 @@
       extras_require={'test': test_requires},
       install_requires=[
           'setuptools',
-          'grok',
+          'zope.app.wsgi',
+          'zope.publisher',
+          'grokcore.view',
           # -*- Extra requirements: -*-
       ],
       entry_points={

Modified: megrok.nozodb/trunk/src/megrok/nozodb/components.py
===================================================================
--- megrok.nozodb/trunk/src/megrok/nozodb/components.py	2010-12-09 08:52:20 UTC (rev 118760)
+++ megrok.nozodb/trunk/src/megrok/nozodb/components.py	2010-12-09 13:02:40 UTC (rev 118761)
@@ -7,6 +7,7 @@
 class ApplicationRoot(grok.GlobalUtility):
     grok.implements(
         grok.interfaces.IApplication,
+        grok.interfaces.IContext,
         site.interfaces.IRootFolder,
         location.ILocation,
         component.interfaces.ISite)

Modified: megrok.nozodb/trunk/src/megrok/nozodb/nozodb.py
===================================================================
--- megrok.nozodb/trunk/src/megrok/nozodb/nozodb.py	2010-12-09 08:52:20 UTC (rev 118760)
+++ megrok.nozodb/trunk/src/megrok/nozodb/nozodb.py	2010-12-09 13:02:40 UTC (rev 118761)
@@ -7,7 +7,9 @@
     """ this factory creates an wsgi-application, which don't
         have a releation to zodb
     """
-    zope_conf = global_conf['zope_conf']
+    zope_conf = local_conf.get('zope_conf')
+    if zope_conf is None:
+        zope_conf = global_conf['zope_conf']
     config(zope_conf)
     app = NOZODBWSGIPublisherApplication(handle_errors=True)
     return app

Modified: megrok.nozodb/trunk/src/megrok/nozodb/utils.py
===================================================================
--- megrok.nozodb/trunk/src/megrok/nozodb/utils.py	2010-12-09 08:52:20 UTC (rev 118760)
+++ megrok.nozodb/trunk/src/megrok/nozodb/utils.py	2010-12-09 13:02:40 UTC (rev 118761)
@@ -9,7 +9,7 @@
 from zope.site.hooks import setSite
 from zope.site.interfaces import IRootFolder
 
-from grok.publication import GrokBrowserPublication
+from grokcore.view.publication import GrokBrowserPublication
 
 from zope.app.appsetup import appsetup, product
 from zope.publisher.interfaces import ISkinnable