[Zope3-checkins] SVN: Zope3/branches/jim-adapter/src/zope/ Move
zope.app.dublincore to zope.dublincore.
Philipp von Weitershausen
philikon at philikon.de
Wed Apr 12 16:16:32 EDT 2006
Log message for revision 66902:
Move zope.app.dublincore to zope.dublincore.
Changed:
D Zope3/branches/jim-adapter/src/zope/app/dublincore/
A Zope3/branches/jim-adapter/src/zope/dublincore/
U Zope3/branches/jim-adapter/src/zope/dublincore/annotatableadapter.py
U Zope3/branches/jim-adapter/src/zope/dublincore/browser/metadataedit.py
U Zope3/branches/jim-adapter/src/zope/dublincore/configure.zcml
U Zope3/branches/jim-adapter/src/zope/dublincore/creatorannotator.py
U Zope3/branches/jim-adapter/src/zope/dublincore/dcterms.py
U Zope3/branches/jim-adapter/src/zope/dublincore/fssync/adapter.py
U Zope3/branches/jim-adapter/src/zope/dublincore/fssync/configure.zcml
U Zope3/branches/jim-adapter/src/zope/dublincore/fssync/zope.app.dublincore.fssync-configure.zcml
U Zope3/branches/jim-adapter/src/zope/dublincore/tests/partial.txt
U Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_creatorannotator.py
U Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_dcsv.py
U Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_xmlmetadata.py
U Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_zdcannotatableadapter.py
U Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_zopedublincore.py
U Zope3/branches/jim-adapter/src/zope/dublincore/timeannotators.py
U Zope3/branches/jim-adapter/src/zope/dublincore/xmlmetadata.py
U Zope3/branches/jim-adapter/src/zope/dublincore/zopedublincore.py
-=-
Copied: Zope3/branches/jim-adapter/src/zope/dublincore (from rev 66899, Zope3/branches/jim-adapter/src/zope/app/dublincore)
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/annotatableadapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/annotatableadapter.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/annotatableadapter.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -22,9 +22,9 @@
import zope.component
from zope.location import Location
from zope.annotation.interfaces import IAnnotations, IAnnotatable
-from zope.app.dublincore.zopedublincore import ZopeDublinCore
-from zope.app.dublincore.zopedublincore import DateProperty, ScalarProperty
-from zope.app.dublincore.interfaces import IWriteZopeDublinCore
+from zope.dublincore.zopedublincore import ZopeDublinCore
+from zope.dublincore.zopedublincore import DateProperty, ScalarProperty
+from zope.dublincore.interfaces import IWriteZopeDublinCore
DCkey = "zope.app.dublincore.ZopeDublinCore"
@@ -56,7 +56,7 @@
A specialized class is used to allow an alternate fssync
serialization to be registered. See the
- zope.app.dublincore.fssync package.
+ zope.dublincore.fssync package.
"""
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/browser/metadataedit.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/browser/metadataedit.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/browser/metadataedit.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -19,10 +19,10 @@
from datetime import datetime
from zope.event import notify
+from zope.dublincore.interfaces import IZopeDublinCore
from zope.lifecycleevent import ObjectModifiedEvent, Attributes
from zope.i18nmessageid import MessageFactory
_ = MessageFactory('zope')
-from zope.app.dublincore.interfaces import IZopeDublinCore
class MetaDataEdit(object):
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/configure.zcml 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/configure.zcml 2006-04-12 20:16:30 UTC (rev 66902)
@@ -14,7 +14,7 @@
<adapter
factory=".annotatableadapter.ZDCAnnotatableAdapter"
- provides="zope.app.dublincore.interfaces.IWriteZopeDublinCore"
+ provides="zope.dublincore.interfaces.IWriteZopeDublinCore"
trusted="true"
/>
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/creatorannotator.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/creatorannotator.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/creatorannotator.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -17,7 +17,7 @@
"""
__docformat__ = 'restructuredtext'
-from zope.app.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.interfaces import IZopeDublinCore
from zope.security.management import queryInteraction
from zope.security.proxy import removeSecurityProxy
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/dcterms.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/dcterms.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/dcterms.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -17,7 +17,7 @@
"""
__docformat__ = 'restructuredtext'
-from zope.app.dublincore import dcsv
+from zope.dublincore import dcsv
# useful namespace URIs
DC_NS = "http://purl.org/dc/elements/1.1/"
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/fssync/adapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/fssync/adapter.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/fssync/adapter.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -11,18 +11,16 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Filesystem synchronization support for zope.app.dublincore.
+"""Filesystem synchronization support for zope.dublincore.
$Id$
"""
__docformat__ = 'restructuredtext'
from zope.interface import implements
-
from zope.fssync.server.entryadapter import ObjectEntryAdapter
from zope.fssync.server.interfaces import IObjectFile
-
class ZDCAnnotationDataAdapter(ObjectEntryAdapter):
implements(IObjectFile)
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/fssync/configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/fssync/configure.zcml 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/fssync/configure.zcml 2006-04-12 20:16:30 UTC (rev 66902)
@@ -3,7 +3,7 @@
xmlns:fssync="http://namespaces.zope.org/fssync">
<fssync:adapter
- class="zope.app.dublincore.annotatableadapter.ZDCAnnotationData"
+ class="zope.dublincore.annotatableadapter.ZDCAnnotationData"
factory=".adapter.ZDCAnnotationDataAdapter"
/>
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/fssync/zope.app.dublincore.fssync-configure.zcml
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/fssync/zope.app.dublincore.fssync-configure.zcml 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/fssync/zope.app.dublincore.fssync-configure.zcml 2006-04-12 20:16:30 UTC (rev 66902)
@@ -1 +1 @@
-<include package="zope.app.dublincore.fssync" />
+<include package="zope.dublincore.fssync" />
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/tests/partial.txt
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/partial.txt 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/tests/partial.txt 2006-04-12 20:16:30 UTC (rev 66902)
@@ -32,7 +32,7 @@
content object and the equivalent Dublin Core field, we can provide a
specific adapter for our object::
- >>> from zope.app.dublincore import annotatableadapter
+ >>> from zope.dublincore import annotatableadapter
>>> factory = annotatableadapter.partialAnnotatableAdapterFactory(
... ["title"])
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_creatorannotator.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_creatorannotator.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_creatorannotator.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -22,8 +22,8 @@
from zope.interface import Interface, implements
import zope.component
-from zope.app.dublincore.creatorannotator import CreatorAnnotator
-from zope.app.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.creatorannotator import CreatorAnnotator
+from zope.dublincore.interfaces import IZopeDublinCore
from zope.security.interfaces import IPrincipal
from zope.security.management import newInteraction, endInteraction
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_dcsv.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_dcsv.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_dcsv.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -18,7 +18,7 @@
import unittest
from zope.testing.doctestunit import DocTestSuite
-from zope.app.dublincore.dcsv import encode, decode
+from zope.dublincore.dcsv import encode, decode
# TODO still need tests for errors, and createMapping()
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_xmlmetadata.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_xmlmetadata.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_xmlmetadata.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -17,8 +17,8 @@
"""
import unittest
-from zope.app.dublincore import dcterms
-from zope.app.dublincore.xmlmetadata import dumpString, parseString
+from zope.dublincore import dcterms
+from zope.dublincore.xmlmetadata import dumpString, parseString
class XMLDublinCoreLoadingTests(unittest.TestCase):
@@ -26,7 +26,7 @@
# Note: We're not using the 'traditional' namespace prefixes in
# the tests since we want to make sure we're doing the right thing
# in the content handler. Also, we should use something we're not
- # using in zope.app.dublincore.dcterms.
+ # using in zope.dublincore.dcterms.
_prefix = ("<?xml version='1.0' encoding='utf-8'?>\n"
"<metadata xmlns:d='%s'\n"
" xmlns:t='%s'\n"
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_zdcannotatableadapter.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_zdcannotatableadapter.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_zdcannotatableadapter.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -27,10 +27,7 @@
class DublinCoreAdapterTest(PlacelessSetup, unittest.TestCase):
def testZDCAnnotatableAdapter(self):
-
- from zope.app.dublincore.annotatableadapter \
- import ZDCAnnotatableAdapter
-
+ from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
annotations = TestAnnotations()
dc = ZDCAnnotatableAdapter(annotations)
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_zopedublincore.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/tests/test_zopedublincore.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/tests/test_zopedublincore.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -22,11 +22,11 @@
def testImplementa(self):
from zope.interface.verify import verifyObject
- from zope.app.dublincore.interfaces import IZopeDublinCore
+ from zope.dublincore.interfaces import IZopeDublinCore
verifyObject(IZopeDublinCore, self.dc)
def _Test__new(self):
- from zope.app.dublincore.zopedublincore import ZopeDublinCore
+ from zope.dublincore.zopedublincore import ZopeDublinCore
return ZopeDublinCore()
def setUp(self):
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/timeannotators.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/timeannotators.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/timeannotators.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -19,7 +19,7 @@
from datetime import datetime
import pytz
-from zope.app.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.interfaces import IZopeDublinCore
from zope.security.proxy import removeSecurityProxy
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/xmlmetadata.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/xmlmetadata.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/xmlmetadata.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -23,7 +23,7 @@
from cStringIO import StringIO
from xml.sax.saxutils import escape, quoteattr
-from zope.app.dublincore import dcterms
+from zope.dublincore import dcterms
XSI_TYPE = (dcterms.XSI_NS, "type")
Modified: Zope3/branches/jim-adapter/src/zope/dublincore/zopedublincore.py
===================================================================
--- Zope3/branches/jim-adapter/src/zope/app/dublincore/zopedublincore.py 2006-04-12 18:09:30 UTC (rev 66899)
+++ Zope3/branches/jim-adapter/src/zope/dublincore/zopedublincore.py 2006-04-12 20:16:30 UTC (rev 66902)
@@ -21,7 +21,7 @@
from zope.interface import implements
from zope.datetime import parseDatetimetz
-from zope.app.dublincore.interfaces import IZopeDublinCore
+from zope.dublincore.interfaces import IZopeDublinCore
class SimpleProperty(object):
More information about the Zope3-Checkins
mailing list