[Checkins] SVN: z3c.jsonrpc/trunk/s fix tests after zope refactoring

[Roger Ineichen]

Log message for revision 96007:
  fix tests after zope refactoring

Changed:
  U   z3c.jsonrpc/trunk/setup.py
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/README.txt
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/error.py
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/ftesting.zcml
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/interfaces.py
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/layer.py
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/zcml.py

-=-
Modified: z3c.jsonrpc/trunk/setup.py
===================================================================
--- z3c.jsonrpc/trunk/setup.py	2009-02-02 20:56:45 UTC (rev 96006)
+++ z3c.jsonrpc/trunk/setup.py	2009-02-02 23:28:38 UTC (rev 96007)
@@ -68,11 +68,10 @@
         ),
     install_requires = [
         'setuptools',
+        'z3c.i18n',
         'z3c.json',
-        'zope.app.component',
         'zope.app.publication',
         'zope.app.twisted',
-        'zope.app.wsgi',
         'zope.component',
         'zope.configuration',
         'zope.i18n',

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/README.txt
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/README.txt	2009-02-02 20:56:45 UTC (rev 96006)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/README.txt	2009-02-02 23:28:38 UTC (rev 96007)
@@ -247,7 +247,7 @@
   >>> browser.open(siteURL + '/content/hello')
   Traceback (most recent call last):
   ...
-  NotFound: Object: <zope.app.folder.folder.Folder...: u'++skin++JSONRPCTestSkin'
+  NotFound: Object: <zope.site.folder.Folder...: u'++skin++JSONRPCTestSkin'
 
 
 Testing
@@ -275,7 +275,6 @@
   >>> p2.available()
   u'Hello World'
 
-
 Now let's make a remote procedure call with a argument:
 
   >>> proxy.greeting(u'Jessy')

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/error.py
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/error.py	2009-02-02 20:56:45 UTC (rev 96006)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/error.py	2009-02-02 23:28:38 UTC (rev 96007)
@@ -15,12 +15,11 @@
 $Id:$
 """
 
-import zope.component
 import zope.i18n
-from zope.publisher.interfaces import NotFound
-from z3c.jsonrpc.interfaces import IMethodPublisher
 
+from z3c.i18n import MessageFactory as _
 
+
 class UnauthorizedResponse(object):
     """Knows how to return error content."""
 

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/ftesting.zcml
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/ftesting.zcml	2009-02-02 20:56:45 UTC (rev 96006)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/ftesting.zcml	2009-02-02 23:28:38 UTC (rev 96007)
@@ -6,38 +6,25 @@
 
   <include package="zope.i18n" file="meta.zcml" />
   <include package="zope.app.component" file="meta.zcml" />
-  <include package="zope.app.component.browser" file="meta.zcml" />
-  <include package="zope.app.container.browser" file="meta.zcml" /> 
-  <include package="zope.app.form.browser" file="meta.zcml" /> 
-  <include package="zope.app.pagetemplate" file="meta.zcml" />
   <include package="zope.app.publication" file="meta.zcml" />
   <include package="zope.app.publisher" file="meta.zcml" />
   <include package="zope.app.security" file="meta.zcml" />
   <include package="zope.securitypolicy" file="meta.zcml" />
 
-  <!-- uhh, remove this later -->
-  <browser:menu id="zmi_views" title="Views" />
-  <browser:menu id="zmi_actions" title="Actions" />
-
   <include package="zope.annotation" />
-  <include package="zope.app.appsetup" /> 
-  <include package="zope.app.component" /> 
-  <include package="zope.app.container" /> 
-  <include package="zope.app.error" />
-  <include package="zope.app.folder" /> 
-  <include package="zope.app.i18n" /> 
+  <include package="zope.component" />
+  <include package="zope.error" />
+  <include package="zope.location" />
+  <include package="zope.publisher" />
+  <include package="zope.traversing" />
+  <include package="zope.app.appsetup" />
+  <include package="zope.app.component" />
+  <include package="zope.app.container" />
   <include package="zope.app.publication" />
-  <include package="zope.app.publisher.browser" />
   <include package="zope.app.publisher" />
   <include package="zope.app.security" />
-  <include package="zope.app.session" /> 
   <include package="zope.app.twisted" />
   <include package="zope.app.wsgi" />
-  <include package="zope.component" />
-  <include package="zope.location" />
-  <include package="zope.publisher" />
-  <include package="zope.traversing" />
-  <include package="zope.traversing.browser" />
 
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy"

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/interfaces.py
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/interfaces.py	2009-02-02 20:56:45 UTC (rev 96006)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/interfaces.py	2009-02-02 23:28:38 UTC (rev 96007)
@@ -21,7 +21,6 @@
 from zope.publisher.interfaces import IPublishTraverse
 from zope.publisher.interfaces.http import IHTTPApplicationRequest
 from zope.publisher.interfaces.http import IHTTPCredentials
-#from zope.publisher.interfaces.xmlrpc import IXMLRPCPublication
 from zope.publisher.interfaces import IPublication
 from zope.app.publication.interfaces import IRequestFactory
 from zope.publisher.interfaces.http import IHTTPRequest

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/layer.py
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/layer.py	2009-02-02 20:56:45 UTC (rev 96006)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/layer.py	2009-02-02 23:28:38 UTC (rev 96007)
@@ -15,7 +15,6 @@
 $Id:$
 """
 
-from zope.publisher.interfaces import browser
 from z3c.jsonrpc import interfaces
 
 

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/zcml.py
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/zcml.py	2009-02-02 20:56:45 UTC (rev 96006)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/zcml.py	2009-02-02 23:28:38 UTC (rev 96007)
@@ -27,7 +27,7 @@
 from zope.configuration.exceptions import ConfigurationError
 
 from zope.component.interface import provideInterface
-from zope.app.component.metaconfigure import handler
+from zope.component.zcml import handler
 
 from z3c.jsonrpc import interfaces
 from z3c.jsonrpc.publisher import MethodPublisher