[Checkins] SVN: zc.extrinsicreference/branches/benji-modernize/s
checkpoint
Benji York
benji at zope.com
Sat Feb 16 17:45:36 EST 2008
Log message for revision 83950:
checkpoint
Changed:
U zc.extrinsicreference/branches/benji-modernize/setup.py
U zc.extrinsicreference/branches/benji-modernize/src/zc/extrinsicreference/README.txt
U zc.extrinsicreference/branches/benji-modernize/src/zc/extrinsicreference/__init__.py
U zc.extrinsicreference/branches/benji-modernize/src/zc/extrinsicreference/tests.py
-=-
Modified: zc.extrinsicreference/branches/benji-modernize/setup.py
===================================================================
--- zc.extrinsicreference/branches/benji-modernize/setup.py 2008-02-16 22:36:24 UTC (rev 83949)
+++ zc.extrinsicreference/branches/benji-modernize/setup.py 2008-02-16 22:45:36 UTC (rev 83950)
@@ -14,11 +14,12 @@
install_requires = [
'ZODB3',
'setuptools',
- 'zope.interface',
- 'zope.interface',
'zc.shortcut',
'zope.app.keyreference',
+# 'zope.app.testing',
+ 'zope.interface',
'zope.location',
+ 'zope.testing',
],
zip_safe = False
)
Modified: zc.extrinsicreference/branches/benji-modernize/src/zc/extrinsicreference/README.txt
===================================================================
--- zc.extrinsicreference/branches/benji-modernize/src/zc/extrinsicreference/README.txt 2008-02-16 22:36:24 UTC (rev 83949)
+++ zc.extrinsicreference/branches/benji-modernize/src/zc/extrinsicreference/README.txt 2008-02-16 22:45:36 UTC (rev 83950)
@@ -2,12 +2,12 @@
Extrinsic References
====================
-Extrinsic registries record a key and one or more values to which they
-refer. The key and all values must be adaptable to
+Extrinsic reference registries record a key and one or more values to which
+they refer. The key and all values must be adaptable to
zope.app.keyreference.interfaces.IKeyReference.
- >>> from zc.extrinsicreference import ExtrinsicReferences
- >>> references = ExtrinsicReferences()
+ >>> import zc.extrinsicreference
+ >>> references = zc.extrinsicreference.ExtrinsicReferences()
>>> references.add(1, 2)
Traceback (most recent call last):
...
Modified: zc.extrinsicreference/branches/benji-modernize/src/zc/extrinsicreference/__init__.py
===================================================================
--- zc.extrinsicreference/branches/benji-modernize/src/zc/extrinsicreference/__init__.py 2008-02-16 22:36:24 UTC (rev 83949)
+++ zc.extrinsicreference/branches/benji-modernize/src/zc/extrinsicreference/__init__.py 2008-02-16 22:45:36 UTC (rev 83950)
@@ -13,9 +13,9 @@
##############################################################################
"""Extrinsic references implementation"""
+from zc.extrinsicreference.interfaces import IExtrinsicReferences
import BTrees
import persistent
-import zc.extrinsicreference.interfaces
import zope.app.keyreference.interfaces
import zope.component
import zope.interface
@@ -23,8 +23,7 @@
class ExtrinsicReferences(persistent.Persistent):
- zope.interface.implements(
- zc.extrinsicreference.interfaces.IExtrinsicReferences)
+ zope.interface.implements(IExtrinsicReferences)
# To be usable as an ILocalUtility we have to have these.
__parent__ = __name__ = None
@@ -33,26 +32,26 @@
self.references = BTrees.OOBTree.OOBTree()
def add(self, obj, value):
- key = zope.app.keyreference.interface.IKeyReference(obj)
+ key = zope.app.keyreference.interfaces.IKeyReference(obj)
refs = self.references.get(key)
if refs is None:
refs = self.references[key] = BTrees.OOBTree.OOTreeSet()
- refs.insert(zope.app.keyreference.interface.IKeyReference(value))
+ refs.insert(zope.app.keyreference.interfaces.IKeyReference(value))
def update(self, obj, values):
- key = zope.app.keyreference.interface.IKeyReference(obj)
+ key = zope.app.keyreference.interfaces.IKeyReference(obj)
refs = self.references.get(key)
if refs is None:
refs = self.references[key] = BTrees.OOBTree.OOTreeSet()
- refs.update(zope.app.keyreference.interface.IKeyReference(v)
+ refs.update(zope.app.keyreference.interfaces.IKeyReference(v)
for v in values)
def remove(self, obj, value):
- key = zope.app.keyreference.interface.IKeyReference(obj)
+ key = zope.app.keyreference.interfaces.IKeyReference(obj)
refs = self.references.get(key)
if refs is not None:
# raises KeyError when the value isn't found
- refs.remove(zope.app.keyreference.interface.IKeyReference(value))
+ refs.remove(zope.app.keyreference.interfaces.IKeyReference(value))
else:
raise KeyError("Object and value pair does not exist")
@@ -63,16 +62,16 @@
pass
def contains(self, obj, value):
- key = zope.app.keyreference.interface.IKeyReference(obj)
+ key = zope.app.keyreference.interfaces.IKeyReference(obj)
refs = self.references.get(key)
if refs is not None:
- return zope.app.keyreference.interface.IKeyReference(value) in refs
+ return zope.app.keyreference.interfaces.IKeyReference(value) in refs
return False
def set(self, obj, values):
- key = zope.app.keyreference.interface.IKeyReference(obj)
+ key = zope.app.keyreference.interfaces.IKeyReference(obj)
refs = self.references.get(key)
- vals = map(zope.app.keyreference.interface.IKeyReference, values)
+ vals = map(zope.app.keyreference.interfaces.IKeyReference, values)
if not vals:
if refs is not None:
# del
@@ -85,7 +84,7 @@
refs.update(vals)
def get(self, obj):
- key = zope.app.keyreference.interface.IKeyReference(obj)
+ key = zope.app.keyreference.interfaces.IKeyReference(obj)
refs = self.references.get(key, ())
for kr in refs:
yield kr()
Modified: zc.extrinsicreference/branches/benji-modernize/src/zc/extrinsicreference/tests.py
===================================================================
--- zc.extrinsicreference/branches/benji-modernize/src/zc/extrinsicreference/tests.py 2008-02-16 22:36:24 UTC (rev 83949)
+++ zc.extrinsicreference/branches/benji-modernize/src/zc/extrinsicreference/tests.py 2008-02-16 22:45:36 UTC (rev 83950)
@@ -15,11 +15,11 @@
import unittest
from zope.testing import doctest
-from zope.app.testing import placelesssetup
+#from zope.app.testing import placelesssetup
def test_suite():
return doctest.DocFileSuite(
- 'extrinsicreference.txt',
- setUp=placelesssetup.setUp, tearDown=placelesssetup.tearDown,
+ 'README.txt',
+# setUp=placelesssetup.setUp, tearDown=placelesssetup.tearDown,
optionflags=doctest.ELLIPSIS)
More information about the Checkins
mailing list