[Checkins] SVN: z3c.vcsync/trunk/ Don't pull in the full grok anymore, just grokcore.component.
Martijn Faassen
faassen at startifact.com
Fri Jun 5 07:06:03 EDT 2009
Log message for revision 100642:
Don't pull in the full grok anymore, just grokcore.component.
Note that we need zope.app.container for container support. Later
on we can move to zope.container but we still need Grok 0.14 compatibility
for now.
Changed:
U z3c.vcsync/trunk/buildout.cfg
U z3c.vcsync/trunk/setup.py
U z3c.vcsync/trunk/src/z3c/vcsync/README.txt
U z3c.vcsync/trunk/src/z3c/vcsync/configure.zcml
U z3c.vcsync/trunk/src/z3c/vcsync/conflict.txt
U z3c.vcsync/trunk/src/z3c/vcsync/importexport.txt
U z3c.vcsync/trunk/src/z3c/vcsync/internal.txt
U z3c.vcsync/trunk/src/z3c/vcsync/svn.py
U z3c.vcsync/trunk/src/z3c/vcsync/tests.py
U z3c.vcsync/trunk/src/z3c/vcsync/vc.py
-=-
Modified: z3c.vcsync/trunk/buildout.cfg
===================================================================
--- z3c.vcsync/trunk/buildout.cfg 2009-06-05 10:46:27 UTC (rev 100641)
+++ z3c.vcsync/trunk/buildout.cfg 2009-06-05 11:06:03 UTC (rev 100642)
@@ -1,7 +1,7 @@
[buildout]
develop = .
parts = test devpython
-extends = http://grok.zope.org/releaseinfo/grok-0.12.cfg
+extends = http://grok.zope.org/releaseinfo/grok-0.14.cfg
versions = versions
find-links = http://download.zope.org/distribution
Modified: z3c.vcsync/trunk/setup.py
===================================================================
--- z3c.vcsync/trunk/setup.py 2009-06-05 10:46:27 UTC (rev 100641)
+++ z3c.vcsync/trunk/setup.py 2009-06-05 11:06:03 UTC (rev 100642)
@@ -24,7 +24,8 @@
zip_safe=False,
install_requires=[
'setuptools',
- 'grok',
+ 'grokcore.component',
+ 'zope.app.container',
'py == 0.9.1',
],
license="ZPL 2.1",
Modified: z3c.vcsync/trunk/src/z3c/vcsync/README.txt
===================================================================
--- z3c.vcsync/trunk/src/z3c/vcsync/README.txt 2009-06-05 10:46:27 UTC (rev 100641)
+++ z3c.vcsync/trunk/src/z3c/vcsync/README.txt 2009-06-05 11:06:03 UTC (rev 100642)
@@ -153,7 +153,7 @@
Let's grok this package first, as it provides some of the required
infrastructure::
- >>> import grok.testing
+ >>> import grokcore.component as grok
>>> grok.testing.grok('z3c.vcsync')
We need to provide a serializer for the Item class that takes an item
Modified: z3c.vcsync/trunk/src/z3c/vcsync/configure.zcml
===================================================================
--- z3c.vcsync/trunk/src/z3c/vcsync/configure.zcml 2009-06-05 10:46:27 UTC (rev 100641)
+++ z3c.vcsync/trunk/src/z3c/vcsync/configure.zcml 2009-06-05 11:06:03 UTC (rev 100642)
@@ -1,3 +1,5 @@
<configure xmlns="http://namespaces.zope.org/grok">
+ <include package="grokcore.component" file="meta.zcml" />
+
<grok package="." />
</configure>
Modified: z3c.vcsync/trunk/src/z3c/vcsync/conflict.txt
===================================================================
--- z3c.vcsync/trunk/src/z3c/vcsync/conflict.txt 2009-06-05 10:46:27 UTC (rev 100641)
+++ z3c.vcsync/trunk/src/z3c/vcsync/conflict.txt 2009-06-05 11:06:03 UTC (rev 100642)
@@ -43,7 +43,7 @@
Let's make sure we can save and load the objects by grokking the
right serializers, parser and factories::
- >>> import grok
+ >>> import grokcore.component as grok
>>> from z3c.vcsync.tests import (ItemSerializer, ItemParser, ItemFactory,
... ContainerParser, ContainerFactory)
>>> grok.testing.grok('z3c.vcsync')
Modified: z3c.vcsync/trunk/src/z3c/vcsync/importexport.txt
===================================================================
--- z3c.vcsync/trunk/src/z3c/vcsync/importexport.txt 2009-06-05 10:46:27 UTC (rev 100641)
+++ z3c.vcsync/trunk/src/z3c/vcsync/importexport.txt 2009-06-05 11:06:03 UTC (rev 100642)
@@ -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')
+ >>> import grokcore.component.testing
+ >>> grokcore.component.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)
Modified: z3c.vcsync/trunk/src/z3c/vcsync/internal.txt
===================================================================
--- z3c.vcsync/trunk/src/z3c/vcsync/internal.txt 2009-06-05 10:46:27 UTC (rev 100641)
+++ z3c.vcsync/trunk/src/z3c/vcsync/internal.txt 2009-06-05 11:06:03 UTC (rev 100642)
@@ -9,8 +9,8 @@
Let's first grok this package::
- >>> import grok.testing
- >>> grok.testing.grok('z3c.vcsync')
+ >>> import grokcore.component.testing
+ >>> grokcore.component.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)
@@ -622,7 +623,7 @@
version control changes a file into one with a different file type
------------------------------------------------------------------
-Some sequence of actions by other users has ccaused a name that
+Some sequence of actions by other users has caused a name that
previously referred to one type of object to now refer to another kind.
Let's define an ``Item2``::
Modified: z3c.vcsync/trunk/src/z3c/vcsync/svn.py
===================================================================
--- z3c.vcsync/trunk/src/z3c/vcsync/svn.py 2009-06-05 10:46:27 UTC (rev 100641)
+++ z3c.vcsync/trunk/src/z3c/vcsync/svn.py 2009-06-05 11:06:03 UTC (rev 100642)
@@ -1,4 +1,4 @@
-import grok
+import grokcore.component as grok
import py
from datetime import datetime
Modified: z3c.vcsync/trunk/src/z3c/vcsync/tests.py
===================================================================
--- z3c.vcsync/trunk/src/z3c/vcsync/tests.py 2009-06-05 10:46:27 UTC (rev 100641)
+++ z3c.vcsync/trunk/src/z3c/vcsync/tests.py 2009-06-05 11:06:03 UTC (rev 100642)
@@ -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/trunk/src/z3c/vcsync/vc.py
===================================================================
--- z3c.vcsync/trunk/src/z3c/vcsync/vc.py 2009-06-05 10:46:27 UTC (rev 100641)
+++ z3c.vcsync/trunk/src/z3c/vcsync/vc.py 2009-06-05 11:06:03 UTC (rev 100642)
@@ -12,7 +12,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