[Checkins] SVN: grokcore.view/trunk/ replace zope.container with zope.app.container reverting earlier changes. make use of dumppickedversions buildout extensions for showing un-pinned dependency versions
Jan-Wijbrand Kolman
janwijbrand at gmail.com
Tue May 19 15:38:54 EDT 2009
Log message for revision 100132:
replace zope.container with zope.app.container reverting earlier changes. make use of dumppickedversions buildout extensions for showing un-pinned dependency versions
Changed:
U grokcore.view/trunk/buildout.cfg
U grokcore.view/trunk/setup.py
U grokcore.view/trunk/src/grokcore/view/ftests/url/url.py
U grokcore.view/trunk/src/grokcore/view/ftests/url/url_function.py
U grokcore.view/trunk/versions.cfg
-=-
Modified: grokcore.view/trunk/buildout.cfg
===================================================================
--- grokcore.view/trunk/buildout.cfg 2009-05-19 19:14:48 UTC (rev 100131)
+++ grokcore.view/trunk/buildout.cfg 2009-05-19 19:38:48 UTC (rev 100132)
@@ -1,8 +1,11 @@
[buildout]
+extends = versions.cfg
+parts =
+ interpreter
+ test
develop = .
-parts = interpreter test
-extends = versions.cfg
versions = versions
+extensions = buildout.dumppickedversions
[interpreter]
recipe = zc.recipe.egg
Modified: grokcore.view/trunk/setup.py
===================================================================
--- grokcore.view/trunk/setup.py 2009-05-19 19:14:48 UTC (rev 100131)
+++ grokcore.view/trunk/setup.py 2009-05-19 19:38:48 UTC (rev 100132)
@@ -43,9 +43,9 @@
'zope.app.pagetemplate',
# for ftests:
# TODO move these to extra_requires?
- 'zope.container',
'zope.testbrowser',
'zope.securitypolicy',
+ 'zope.app.container',
'zope.app.zcmlfiles',
'zope.app.authentication',
],
Modified: grokcore.view/trunk/src/grokcore/view/ftests/url/url.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/url/url.py 2009-05-19 19:14:48 UTC (rev 100131)
+++ grokcore.view/trunk/src/grokcore/view/ftests/url/url.py 2009-05-19 19:38:48 UTC (rev 100132)
@@ -22,7 +22,7 @@
>>> browser.open("http://localhost/herd/manfred/yetanother")
>>> print browser.contents
http://localhost/herd/manfred/yetanother
-
+
We get the views manually so we can do a greater variety of url() calls:
>>> from zope import component
@@ -72,11 +72,11 @@
>>> another_view.url('yet_another_view')
'http://127.0.0.1/herd/manfred/yet_another_view'
-The url() method supports a data argument which is converted to a CGI type query
-string. If any of the values are of type unicode it's converted to a string
+The url() method supports a data argument which is converted to a CGI type query
+string. If any of the values are of type unicode it's converted to a string
assuming the encoding is UTF-8.
-There is some object/name/data resolution code available that provides the magic
+There is some object/name/data resolution code available that provides the magic
to make mixing of positional arguments and keyword arguments work.
This is the key word argument signature::
@@ -90,13 +90,13 @@
>>> index_view.url(data=dict(age=28))
'http://127.0.0.1/herd/manfred/index?age=28'
-There is no problem putting one of the 'reserved' arguments inside the data
+There is no problem putting one of the 'reserved' arguments inside the data
argument or explicitely supplying 'None':
>>> index_view.url(herd, None, data=dict(name="Peter"))
'http://127.0.0.1/herd?name=Peter'
-Since order in dictionairies is arbitrary we'll test the presence of multiple
+Since order in dictionairies is arbitrary we'll test the presence of multiple
keywords by using find()
>>> url = index_view.url('sample_view', data=dict(a=1, b=2, c=3))
@@ -133,21 +133,21 @@
Traceback (most recent call last):
...
TypeError: url() data argument must be a dict.
-
-Since we're relying on urllib to do the CGI parameter encoding it's quite
+
+Since we're relying on urllib to do the CGI parameter encoding it's quite
smart but fails on unicode objects but url() is programmed to automatically
convert unicode to UTF-8 on the fly.
>>> index_view.url(data={'name':u'Andr\xe9'})
'http://127.0.0.1/herd/manfred/index?name=Andr%C3%A9'
-
+
As we're relying on urllib to do the url encoding, it also converts values that
are lists to repeated key value pairs such that key=[1,2] becomes key=1&key=2
>>> index_view.url(data={'key':[1,2]})
'http://127.0.0.1/herd/manfred/index?key=1&key=2'
-We also make sure the values in the list that are unicode instances are encoded
+We also make sure the values in the list that are unicode instances are encoded
properly:
>>> result = index_view.url(data={'key':[u'\xe9',2]})
@@ -173,7 +173,7 @@
"""
import grokcore.view as grok
-from zope.container.contained import Contained
+from zope.app.container.contained import Contained
class Mammoth(Contained):
pass
@@ -183,7 +183,7 @@
class Index(grok.View):
def render(self):
return self.url()
-
+
class Another(grok.View):
def render(self):
return self.url()
@@ -194,7 +194,7 @@
class Multiplier(grok.View):
def update(self, age=0):
self.age = age
-
+
def render(self):
return unicode(self.age * 2)
Modified: grokcore.view/trunk/src/grokcore/view/ftests/url/url_function.py
===================================================================
--- grokcore.view/trunk/src/grokcore/view/ftests/url/url_function.py 2009-05-19 19:14:48 UTC (rev 100131)
+++ grokcore.view/trunk/src/grokcore/view/ftests/url/url_function.py 2009-05-19 19:38:48 UTC (rev 100132)
@@ -22,7 +22,7 @@
>>> browser.open("http://localhost/herd/manfred/another")
>>> print browser.contents
http://localhost/herd/manfred/another
-
+
We get the views manually so we can do a greater variety of url() calls:
>>> from zope import component
@@ -64,7 +64,7 @@
"""
import grokcore.view as grok
from grokcore.view import url
-from zope.container.contained import Contained
+from zope.app.container.contained import Contained
class Mammoth(Contained):
pass
@@ -74,7 +74,7 @@
class Index(grok.View):
def render(self):
return url(self.request, self)
-
+
class Another(grok.View):
def render(self):
return url(self.request, self)
Modified: grokcore.view/trunk/versions.cfg
===================================================================
--- grokcore.view/trunk/versions.cfg 2009-05-19 19:14:48 UTC (rev 100131)
+++ grokcore.view/trunk/versions.cfg 2009-05-19 19:38:48 UTC (rev 100132)
@@ -106,4 +106,3 @@
zope.thread = 3.4
zope.traversing = 3.4.1
zope.viewlet = 3.4.2
-zope.container = 3.8.1
More information about the Checkins
mailing list