[Checkins] SVN: z3c.vcsync/branches/use-grokcore.component/ Port
over to grokcore.component (on a branch for now).
Martijn Faassen
faassen at infrae.com
Tue May 6 05:16:35 EDT 2008
Log message for revision 86493:
Port over to grokcore.component (on a branch for now).
Changed:
U z3c.vcsync/branches/use-grokcore.component/buildout.cfg
U z3c.vcsync/branches/use-grokcore.component/setup.py
U z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/README.txt
U z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/configure.zcml
U z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/conflict.txt
U z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/importexport.txt
U z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/internal.txt
U z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/svn.py
U z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/tests.py
U z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/vc.py
-=-
Modified: z3c.vcsync/branches/use-grokcore.component/buildout.cfg
===================================================================
--- z3c.vcsync/branches/use-grokcore.component/buildout.cfg 2008-05-06 09:12:54 UTC (rev 86492)
+++ z3c.vcsync/branches/use-grokcore.component/buildout.cfg 2008-05-06 09:16:35 UTC (rev 86493)
@@ -1,11 +1,26 @@
[buildout]
develop = .
parts = test devpython
-extends = http://grok.zope.org/releaseinfo/grok-0.11.cfg
versions = versions
[versions]
-martian = 0.9.2
+grokcore.component = 1.2.1
+martian = 0.9.5
+py = 0.9.1
+setuptools = 0.6c8
+zc.recipe.egg = 1.0.0
+zc.recipe.testrunner = 1.0.0
+zope.component = 3.4.0
+zope.configuration = 3.4.0
+zope.deferredimport = 3.4.0
+zope.deprecation = 3.4.0
+zope.event = 3.4.0
+zope.i18nmessageid = 3.4.3
+zope.interface = 3.4.1
+zope.proxy = 3.4.0
+zope.schema = 3.4.0
+zope.testing = 3.5.1
+# XXX should set the dependencies for zope.app.container as well eventually
[test]
recipe = zc.recipe.testrunner
Modified: z3c.vcsync/branches/use-grokcore.component/setup.py
===================================================================
--- z3c.vcsync/branches/use-grokcore.component/setup.py 2008-05-06 09:12:54 UTC (rev 86492)
+++ z3c.vcsync/branches/use-grokcore.component/setup.py 2008-05-06 09:16:35 UTC (rev 86493)
@@ -11,7 +11,8 @@
zip_safe=False,
install_requires=[
'setuptools',
- 'grok',
+ 'grokcore.component',
+ 'zope.app.container',
'py',
],
entry_points="""
Modified: z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/README.txt
===================================================================
--- z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/README.txt 2008-05-06 09:12:54 UTC (rev 86492)
+++ z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/README.txt 2008-05-06 09:16:35 UTC (rev 86493)
@@ -141,8 +141,8 @@
Let's grok this package first, as it provides some of the required
infrastructure::
- >>> import grok.testing
- >>> grok.testing.grok('z3c.vcsync')
+ >>> from grokcore.component import testing
+ >>> testing.grok('z3c.vcsync')
We need to provide a serializer for the Item class that takes an item
and writes it to the filesystem to a file with a particular extension
@@ -166,11 +166,11 @@
We register these components::
- >>> grok.testing.grok_component('ItemSerializer', ItemSerializer)
+ >>> testing.grok_component('ItemSerializer', ItemSerializer)
True
- >>> grok.testing.grok_component('ItemParser', ItemParser)
+ >>> testing.grok_component('ItemParser', ItemParser)
True
- >>> grok.testing.grok_component('ItemFactory', ItemFactory)
+ >>> testing.grok_component('ItemFactory', ItemFactory)
True
We also need a parser and factory for containers, registered for the
@@ -178,9 +178,9 @@
simple::
>>> from z3c.vcsync.tests import ContainerParser, ContainerFactory
- >>> grok.testing.grok_component('ContainerParser', ContainerParser)
+ >>> testing.grok_component('ContainerParser', ContainerParser)
True
- >>> grok.testing.grok_component('ContainerFactory', ContainerFactory)
+ >>> testing.grok_component('ContainerFactory', ContainerFactory)
True
Setting up the SVN repository
Modified: z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/configure.zcml
===================================================================
--- z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/configure.zcml 2008-05-06 09:12:54 UTC (rev 86492)
+++ z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/configure.zcml 2008-05-06 09:16:35 UTC (rev 86493)
@@ -1,3 +1,5 @@
<configure xmlns="http://namespaces.zope.org/grok">
+ <include package="zope.app.container" />
+ <include package="grokcore.component" name="meta.zcml" />
<grok package="." />
</configure>
Modified: z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/conflict.txt
===================================================================
--- z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/conflict.txt 2008-05-06 09:12:54 UTC (rev 86492)
+++ z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/conflict.txt 2008-05-06 09:16:35 UTC (rev 86493)
@@ -42,19 +42,19 @@
Let's make sure we can save and load the objects by grokking the
right serializers, parser and factories::
- >>> import grok
+ >>> from grokcore.component import testing
>>> from z3c.vcsync.tests import (ItemSerializer, ItemParser, ItemFactory,
... ContainerParser, ContainerFactory)
- >>> grok.testing.grok('z3c.vcsync')
- >>> grok.testing.grok_component('ItemSerializer', ItemSerializer)
+ >>> testing.grok('z3c.vcsync')
+ >>> testing.grok_component('ItemSerializer', ItemSerializer)
True
- >>> grok.testing.grok_component('ItemParser', ItemParser)
+ >>> testing.grok_component('ItemParser', ItemParser)
True
- >>> grok.testing.grok_component('ItemFactory', ItemFactory)
+ >>> testing.grok_component('ItemFactory', ItemFactory)
True
- >>> grok.testing.grok_component('ContainerParser', ContainerParser)
+ >>> testing.grok_component('ContainerParser', ContainerParser)
True
- >>> grok.testing.grok_component('ContainerFactory', ContainerFactory)
+ >>> testing.grok_component('ContainerFactory', ContainerFactory)
True
Let's set up an SVN repository and initial checkout::
Modified: z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/importexport.txt
===================================================================
--- z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/importexport.txt 2008-05-06 09:12:54 UTC (rev 86492)
+++ z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/importexport.txt 2008-05-06 09:16:35 UTC (rev 86493)
@@ -37,13 +37,13 @@
First we need to grok this package itself (normally done when you use
it)::
- >>> import grok.testing
- >>> grok.testing.grok('z3c.vcsync')
+ >>> from grokcore.component import testing
+ >>> testing.grok('z3c.vcsync')
In order to be able to export instances of ``Item``, we need to set up
an ``ISerializer``::
- >>> import grok
+ >>> import grokcore.component as grok
>>> from z3c.vcsync.interfaces import ISerializer
>>> class ItemSerializer(grok.Adapter):
... grok.provides(ISerializer)
@@ -53,7 +53,7 @@
... f.write('\n')
... def name(self):
... return self.context.__name__ + '.test'
- >>> grok.testing.grok_component('ItemSerializer', ItemSerializer)
+ >>> testing.grok_component('ItemSerializer', ItemSerializer)
True
Exporting
@@ -130,7 +130,7 @@
... def __call__(self, path):
... payload = int(path.read())
... return Item(payload)
- >>> grok.testing.grok_component('ItemFactory', ItemFactory)
+ >>> testing.grok_component('ItemFactory', ItemFactory)
True
The factory to create the container::
@@ -139,7 +139,7 @@
... grok.provides(IFactory)
... def __call__(self, path):
... return Container()
- >>> grok.testing.grok_component('ContainerFactory', ContainerFactory)
+ >>> testing.grok_component('ContainerFactory', ContainerFactory)
True
Importing
Modified: z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/internal.txt
===================================================================
--- z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/internal.txt 2008-05-06 09:12:54 UTC (rev 86492)
+++ z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/internal.txt 2008-05-06 09:16:35 UTC (rev 86493)
@@ -9,8 +9,8 @@
Let's first grok this package::
- >>> import grok.testing
- >>> grok.testing.grok('z3c.vcsync')
+ >>> from grokcore.component import testing
+ >>> testing.grok('z3c.vcsync')
Serialization
-------------
@@ -31,6 +31,7 @@
We will use an ISerializer adapter to serialize it to a file. Let's
define the adapter::
+ >>> import grokcore.component as grok
>>> from z3c.vcsync.interfaces import ISerializer
>>> class ItemSerializer(grok.Adapter):
... grok.provides(ISerializer)
@@ -51,7 +52,7 @@
Let's register the adapter::
- >>> grok.testing.grok_component('ItemSerializer', ItemSerializer)
+ >>> testing.grok_component('ItemSerializer', ItemSerializer)
True
We can now use the adapter::
@@ -263,7 +264,7 @@
... f.write('\n')
... def name(self):
... return self.context.__name__ + '.other'
- >>> grok.testing.grok_component('OtherItemSerializer', OtherItemSerializer)
+ >>> testing.grok_component('OtherItemSerializer', OtherItemSerializer)
True
Note that the extension we serialize to is ``.other``.
@@ -317,7 +318,7 @@
... grok.name('.test')
... def __call__(self, object, path):
... object.payload = int(path.read())
- >>> grok.testing.grok_component('ItemParser', ItemParser)
+ >>> testing.grok_component('ItemParser', ItemParser)
True
To have the ability to create new objects, a factory is registered for
@@ -333,7 +334,7 @@
... item = Item(None) # dummy payload
... parser(item, path)
... return item
- >>> grok.testing.grok_component('ItemFactory', ItemFactory)
+ >>> testing.grok_component('ItemFactory', ItemFactory)
True
Now for containers. They are registered for an empty extension::
@@ -342,7 +343,7 @@
... grok.provides(IParser)
... def __call__(self, object, path):
... pass # do nothing with existing containers
- >>> grok.testing.grok_component('ContainerParser', ContainerParser)
+ >>> testing.grok_component('ContainerParser', ContainerParser)
True
We implement ``ContainerFactory`` in terms of
@@ -357,7 +358,7 @@
... container = Container()
... parser(container, path)
... return container
- >>> grok.testing.grok_component('ContainerFactory', ContainerFactory)
+ >>> testing.grok_component('ContainerFactory', ContainerFactory)
True
We need to maintain a list of everything modified or added, and a list
@@ -626,7 +627,7 @@
... grok.name('.test2')
... def __call__(self, object, path):
... object.payload = int(path.read()) ** 2
- >>> grok.testing.grok_component('Item2Parser', Item2Parser)
+ >>> testing.grok_component('Item2Parser', Item2Parser)
True
>>> class Item2Factory(grok.GlobalUtility):
... grok.provides(IFactory)
@@ -636,7 +637,7 @@
... item = Item2(None) # dummy payload
... parser(item, path)
... return item
- >>> grok.testing.grok_component('Item2Factory', Item2Factory)
+ >>> testing.grok_component('Item2Factory', Item2Factory)
True
Now we define an update function that replaces ``hoi.test`` with
Modified: z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/svn.py
===================================================================
--- z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/svn.py 2008-05-06 09:12:54 UTC (rev 86492)
+++ z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/svn.py 2008-05-06 09:16:35 UTC (rev 86493)
@@ -1,4 +1,4 @@
-import grok
+import grokcore.component as grok
import py
from datetime import datetime
Modified: z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/tests.py
===================================================================
--- z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/tests.py 2008-05-06 09:12:54 UTC (rev 86492)
+++ z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/tests.py 2008-05-06 09:16:35 UTC (rev 86493)
@@ -5,7 +5,7 @@
import py.path
from py.__.path.svn import svncommon
from datetime import datetime
-import grok
+import grokcore.component as grok
from zope import component
from zope.interface import implements, Interface
Modified: z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/vc.py
===================================================================
--- z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/vc.py 2008-05-06 09:12:54 UTC (rev 86492)
+++ z3c.vcsync/branches/use-grokcore.component/src/z3c/vcsync/vc.py 2008-05-06 09:16:35 UTC (rev 86493)
@@ -11,7 +11,7 @@
IState, IFactory, ISynchronizer,
ISynchronizationInfo)
-import grok
+import grokcore.component as grok
class Dump(grok.Adapter):
"""General dump for arbitrary objects.
More information about the Checkins
mailing list