[Checkins] SVN: grokcore.xmlrpc/trunk/ clean up auto-checkout, now depend on yet unreleased zope.errorview
Jan-Wijbrand Kolman
janwijbrand at gmail.com
Tue Jan 18 11:37:46 EST 2011
Log message for revision 119662:
clean up auto-checkout, now depend on yet unreleased zope.errorview
Changed:
U grokcore.xmlrpc/trunk/buildout.cfg
U grokcore.xmlrpc/trunk/setup.py
U grokcore.xmlrpc/trunk/src/grokcore/xmlrpc/configure.zcml
U grokcore.xmlrpc/trunk/src/grokcore/xmlrpc/ftesting.zcml
U grokcore.xmlrpc/trunk/src/grokcore/xmlrpc/ftests/xmlrpc/require.py
-=-
Modified: grokcore.xmlrpc/trunk/buildout.cfg
===================================================================
--- grokcore.xmlrpc/trunk/buildout.cfg 2011-01-18 16:11:30 UTC (rev 119661)
+++ grokcore.xmlrpc/trunk/buildout.cfg 2011-01-18 16:37:46 UTC (rev 119662)
@@ -1,34 +1,25 @@
[buildout]
extends = http://svn.zope.org/repos/main/groktoolkit/trunk/grok.cfg
+develop = .
parts =
- test
- omelette
-develop =
- .
-versions = versions
-extensions =
- buildout.dumppickedversions
- mr.developer
+ test
+ omelette
+extensions =
+ buildout.dumppickedversions
+ mr.developer
+auto-checkout =
+ zope.errorview
-sources = sources
-auto-checkout =
- grokcore.traverser
- grokcore.rest
+[versions]
+grokcore.xmlrpc =
-[sources]
-grokcore.traverser = svn http://svn.zope.org/repos/main/grokcore.traverser/trunk
-grokcore.rest = svn http://svn.zope.org/repos/main/grokcore.rest/trunk
-
[omelette]
recipe = collective.recipe.omelette
eggs = ${test:eggs}
-[versions]
-grokcore.xmlrpc =
-
[test]
recipe = zc.recipe.testrunner
eggs =
grokcore.xmlrpc
grokcore.xmlrpc[test]
-defaults = ['--tests-pattern', '^f?tests$', '-v', '--package','grokcore.xmlrpc']
+defaults = ['--tests-pattern', '^f?tests$', '-v']
Modified: grokcore.xmlrpc/trunk/setup.py
===================================================================
--- grokcore.xmlrpc/trunk/setup.py 2011-01-18 16:11:30 UTC (rev 119661)
+++ grokcore.xmlrpc/trunk/setup.py 2011-01-18 16:37:46 UTC (rev 119662)
@@ -14,11 +14,11 @@
)
tests_require = [
+ 'grokcore.view [security_publication]',
'grokcore.view [test]',
- 'grokcore.view [security_publication]',
+ 'zope.app.appsetup',
'zope.app.wsgi',
- 'zope.app.appsetup',
-# 'zope.app.http',
+ 'zope.errorview',
'zope.testing',
]
Modified: grokcore.xmlrpc/trunk/src/grokcore/xmlrpc/configure.zcml
===================================================================
--- grokcore.xmlrpc/trunk/src/grokcore/xmlrpc/configure.zcml 2011-01-18 16:11:30 UTC (rev 119661)
+++ grokcore.xmlrpc/trunk/src/grokcore/xmlrpc/configure.zcml 2011-01-18 16:37:46 UTC (rev 119662)
@@ -1,20 +1,20 @@
<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:browser="http://namespaces.zope.org/browser"
- xmlns:grok="http://namespaces.zope.org/grok">
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:browser="http://namespaces.zope.org/browser"
+ xmlns:grok="http://namespaces.zope.org/grok">
+ <include package="." file="meta.zcml" />
+
<!-- this overrides Zope 3's publication factories because they have
- the same name; we also need to change the priority because of
- the ZCML discriminator -->
+ the same name; we also need to change the priority because of
+ the ZCML discriminator -->
+
<publisher
- name="XMLRPC"
- factory=".publication.GrokXMLRPCFactory"
- methods="POST"
- mimetypes="text/xml"
- priority="21"
- />
+ name="XMLRPC"
+ factory=".publication.GrokXMLRPCFactory"
+ methods="POST"
+ mimetypes="text/xml"
+ priority="21"
+ />
-
- <include package="." file="meta.zcml" />
-
</configure>
Modified: grokcore.xmlrpc/trunk/src/grokcore/xmlrpc/ftesting.zcml
===================================================================
--- grokcore.xmlrpc/trunk/src/grokcore/xmlrpc/ftesting.zcml 2011-01-18 16:11:30 UTC (rev 119661)
+++ grokcore.xmlrpc/trunk/src/grokcore/xmlrpc/ftesting.zcml 2011-01-18 16:37:46 UTC (rev 119662)
@@ -1,15 +1,16 @@
<configure
- xmlns="http://namespaces.zope.org/zope"
- xmlns:grok="http://namespaces.zope.org/grok"
- xmlns:browser="http://namespaces.zope.org/browser"
- i18n_domain="grokcore.xmlrpc"
- package="grokcore.xmlrpc">
+ xmlns="http://namespaces.zope.org/zope"
+ xmlns:grok="http://namespaces.zope.org/grok"
+ xmlns:browser="http://namespaces.zope.org/browser"
+ i18n_domain="grokcore.xmlrpc"
+ package="grokcore.xmlrpc">
- <include package="grokcore.view" file="ftesting.zcml" />
- <include package="grokcore.xmlrpc" />
- <include package="grokcore.traverser" />
- <include package="grokcore.view" file="publication_security.zcml" />
+ <include package="zope.errorview" file="errorview.zcml" />
+ <include package="grokcore.view" file="ftesting.zcml" />
+ <include package="grokcore.xmlrpc" />
+ <include package="grokcore.traverser" />
+ <include package="grokcore.view" file="publication_security.zcml" />
- <grok:grok package=".ftests" />
+ <grok:grok package=".ftests" />
</configure>
Modified: grokcore.xmlrpc/trunk/src/grokcore/xmlrpc/ftests/xmlrpc/require.py
===================================================================
--- grokcore.xmlrpc/trunk/src/grokcore/xmlrpc/ftests/xmlrpc/require.py 2011-01-18 16:11:30 UTC (rev 119661)
+++ grokcore.xmlrpc/trunk/src/grokcore/xmlrpc/ftests/xmlrpc/require.py 2011-01-18 16:37:46 UTC (rev 119662)
@@ -9,29 +9,6 @@
>>> print server.stomp()
Manfred stomped.
-XXX temporarily register a view for Unauthorized exceptions, awaiting a
-[zope|grokcore].errorview package.
-
- >>> from zope.interface import implements
- >>> from zope.component import provideAdapter
- >>> from zope.security.interfaces import IUnauthorized
- >>> from zope.publisher.interfaces.http import IHTTPRequest, IHTTPException
- >>> class Unauthorized(object):
- ... implements(IHTTPException)
- ... def __init__(self, context, request):
- ... self.context = context
- ... self.request = request
- ... def __call__(self):
- ... self.request.unauthorized('basic realm="Zope"')
- ... return ''
- ... __str__ = __call__
- >>> provideAdapter(
- ... Unauthorized, adapts=(IUnauthorized, IHTTPRequest), name='index.html')
- >>> from zope.publisher.interfaces import IDefaultViewName
- >>> provideAdapter(
- ... 'index.html', adapts=(IUnauthorized, IHTTPRequest),
- ... provides=IDefaultViewName)
-
>>> print server.dance()
Traceback (most recent call last):
ProtocolError: <ProtocolError for localhost/: 401 401 Unauthorized>
More information about the checkins
mailing list