[Checkins] SVN: mongopersist/trunk/ - update to latest package versions
Adam Groszer
cvs-admin at zope.org
Tue Jan 29 11:29:20 UTC 2013
Log message for revision 129110:
- update to latest package versions
biggest change: ``pymongo`` does not reexport ``objectid`` and ``dbref``
Changed:
U mongopersist/trunk/CHANGES.txt
U mongopersist/trunk/buildout.cfg
U mongopersist/trunk/src/mongopersist/interfaces.py
U mongopersist/trunk/src/mongopersist/mapping.py
U mongopersist/trunk/src/mongopersist/serialize.py
U mongopersist/trunk/src/mongopersist/tests/test_datamanager.py
U mongopersist/trunk/src/mongopersist/tests/test_mapping.py
U mongopersist/trunk/src/mongopersist/tests/test_serialize.py
U mongopersist/trunk/src/mongopersist/zope/container.py
U mongopersist/trunk/versions.cfg
-=-
Modified: mongopersist/trunk/CHANGES.txt
===================================================================
--- mongopersist/trunk/CHANGES.txt 2013-01-27 19:11:54 UTC (rev 129109)
+++ mongopersist/trunk/CHANGES.txt 2013-01-29 11:29:20 UTC (rev 129110)
@@ -5,7 +5,8 @@
0.7.3 (unreleased)
------------------
-- ...
+- update to latest package versions
+ biggest change: ``pymongo`` does not reexport ``objectid`` and ``dbref``
0.7.2 (2012-04-19)
------------------
Modified: mongopersist/trunk/buildout.cfg
===================================================================
--- mongopersist/trunk/buildout.cfg 2013-01-27 19:11:54 UTC (rev 129109)
+++ mongopersist/trunk/buildout.cfg 2013-01-29 11:29:20 UTC (rev 129110)
@@ -9,6 +9,7 @@
newest = false
include-site-packages = false
unzip = true
+prefer-final = true
[test]
recipe = zc.recipe.testrunner
Modified: mongopersist/trunk/src/mongopersist/interfaces.py
===================================================================
--- mongopersist/trunk/src/mongopersist/interfaces.py 2013-01-27 19:11:54 UTC (rev 129109)
+++ mongopersist/trunk/src/mongopersist/interfaces.py 2013-01-29 11:29:20 UTC (rev 129110)
@@ -19,12 +19,13 @@
import types
import zope.interface
import zope.schema
-from pymongo import objectid, dbref
+from bson import objectid, dbref
MONGO_NATIVE_TYPES = (
int, float, unicode, datetime.datetime, types.NoneType,
objectid.ObjectId, dbref.DBRef)
+
class ConflictError(transaction.interfaces.TransientError):
"""An error raised when a write conflict is detected."""
@@ -50,20 +51,21 @@
def __str__(self):
extras = [
- 'oid %s' %self.object._p_oid,
- 'class %s' %self.object.__class__.__name__,
- 'orig serial %s' %self.orig_serial,
- 'cur serial %s' %self.cur_serial,
- 'new serial %s' %self.new_serial]
+ 'oid %s' % self.object._p_oid,
+ 'class %s' % self.object.__class__.__name__,
+ 'orig serial %s' % self.orig_serial,
+ 'cur serial %s' % self.cur_serial,
+ 'new serial %s' % self.new_serial]
return "%s (%s)" % (self.message, ", ".join(extras))
def __repr__(self):
- return '%s: %s' %(self.__class__.__name__, self)
+ return '%s: %s' % (self.__class__.__name__, self)
class CircularReferenceError(Exception):
pass
+
class IConflictHandler(zope.interface.Interface):
datamanager = zope.interface.Attribute(
@@ -104,6 +106,7 @@
conflicts.
"""
+
class IResolvingConflictHandler(IConflictHandler):
"""A conflict handler that is able to resolve conflicts."""
Modified: mongopersist/trunk/src/mongopersist/mapping.py
===================================================================
--- mongopersist/trunk/src/mongopersist/mapping.py 2013-01-27 19:11:54 UTC (rev 129109)
+++ mongopersist/trunk/src/mongopersist/mapping.py 2013-01-29 11:29:20 UTC (rev 129110)
@@ -14,9 +14,8 @@
"""Mongo Mapping Implementations"""
from __future__ import absolute_import
import UserDict
-import pymongo
+import bson.dbref
-from mongopersist import interfaces
class MongoCollectionMapping(UserDict.DictMixin, object):
__mongo_database__ = None
@@ -41,7 +40,7 @@
if doc is None:
raise KeyError(key)
db_name = self.__mongo_database__ or self._m_jar.default_database
- dbref = pymongo.dbref.DBRef(
+ dbref = bson.dbref.DBRef(
self.__mongo_collection__, doc['_id'], db_name)
return self._m_jar._reader.get_ghost(dbref)
Modified: mongopersist/trunk/src/mongopersist/serialize.py
===================================================================
--- mongopersist/trunk/src/mongopersist/serialize.py 2013-01-27 19:11:54 UTC (rev 129109)
+++ mongopersist/trunk/src/mongopersist/serialize.py 2013-01-29 11:29:20 UTC (rev 129110)
@@ -20,7 +20,8 @@
import persistent.interfaces
import persistent.dict
import persistent.list
-import pymongo.binary
+import bson.dbref
+import bson.binary
import repoze.lru
import types
import zope.interface
@@ -37,9 +38,11 @@
AVAILABLE_NAME_MAPPINGS = set()
PATH_RESOLVE_CACHE = {}
+
def get_dotted_name(obj):
- return obj.__module__+'.'+obj.__name__
+ return obj.__module__ + '.' + obj.__name__
+
class PersistentDict(persistent.dict.PersistentDict):
_p_mongo_sub_object = True
@@ -187,7 +190,7 @@
obj.decode('utf-8')
return obj
except UnicodeError:
- return pymongo.binary.Binary(obj)
+ return bson.binary.Binary(obj)
# Some objects might not naturally serialize well and create a very
# ugly Mongo entry. Thus, we allow custom serializers to be
@@ -275,7 +278,7 @@
doc_id = coll.insert(doc)
stored = True
obj._p_jar = self._jar
- obj._p_oid = pymongo.dbref.DBRef(coll_name, doc_id, db_name)
+ obj._p_oid = bson.dbref.DBRef(coll_name, doc_id, db_name)
# Make sure that any other code accessing this object in this
# session, gets the same instance.
self._jar._object_cache[hash(obj._p_oid)] = obj
@@ -454,7 +457,7 @@
if isinstance(state, bson.objectid.ObjectId):
# The object id is special. Preserve it.
return state
- if isinstance(state, pymongo.binary.Binary):
+ if isinstance(state, bson.binary.Binary):
# Binary data in Python 2 is presented as a string. We will
# convert back to binary when serializing again.
return str(state)
Modified: mongopersist/trunk/src/mongopersist/tests/test_datamanager.py
===================================================================
--- mongopersist/trunk/src/mongopersist/tests/test_datamanager.py 2013-01-27 19:11:54 UTC (rev 129109)
+++ mongopersist/trunk/src/mongopersist/tests/test_datamanager.py 2013-01-29 11:29:20 UTC (rev 129110)
@@ -15,7 +15,7 @@
import doctest
import persistent
import transaction
-from pymongo import dbref, objectid
+from bson import dbref, objectid
from mongopersist import conflict, interfaces, testing, datamanager
Modified: mongopersist/trunk/src/mongopersist/tests/test_mapping.py
===================================================================
--- mongopersist/trunk/src/mongopersist/tests/test_mapping.py 2013-01-27 19:11:54 UTC (rev 129109)
+++ mongopersist/trunk/src/mongopersist/tests/test_mapping.py 2013-01-29 11:29:20 UTC (rev 129110)
@@ -16,7 +16,7 @@
import persistent
import pprint
import transaction
-from pymongo import dbref, objectid
+from bson import dbref, objectid
from mongopersist import testing, mapping
Modified: mongopersist/trunk/src/mongopersist/tests/test_serialize.py
===================================================================
--- mongopersist/trunk/src/mongopersist/tests/test_serialize.py 2013-01-27 19:11:54 UTC (rev 129109)
+++ mongopersist/trunk/src/mongopersist/tests/test_serialize.py 2013-01-29 11:29:20 UTC (rev 129110)
@@ -17,7 +17,7 @@
import persistent
import pprint
-from pymongo import binary, dbref, objectid
+from bson import binary, dbref, objectid
from mongopersist import conflict, serialize, testing
Modified: mongopersist/trunk/src/mongopersist/zope/container.py
===================================================================
--- mongopersist/trunk/src/mongopersist/zope/container.py 2013-01-27 19:11:54 UTC (rev 129109)
+++ mongopersist/trunk/src/mongopersist/zope/container.py 2013-01-29 11:29:20 UTC (rev 129110)
@@ -14,17 +14,18 @@
"""Mongo Persistence Zope Containers"""
import UserDict
import persistent
-import pymongo.dbref
-import pymongo.objectid
+import bson.dbref
+import bson.objectid
import zope.component
from bson.errors import InvalidId
from rwproperty import getproperty, setproperty
from zope.container import contained, sample
from zope.container.interfaces import IContainer
-from mongopersist import interfaces, serialize
+from mongopersist import interfaces
from mongopersist.zope import interfaces as zinterfaces
+
class MongoContained(contained.Contained):
@getproperty
@@ -165,7 +166,7 @@
def _load_one(self, doc):
# Create a DBRef object and then load the full state of the object.
- dbref = pymongo.dbref.DBRef(
+ dbref = bson.dbref.DBRef(
self._m_collection, doc['_id'],
self._m_database or self._m_jar.default_database)
# Stick the doc into the _latest_states:
@@ -285,7 +286,7 @@
def __getitem__(self, key):
try:
- id = pymongo.objectid.ObjectId(key)
+ id = bson.objectid.ObjectId(key)
except InvalidId:
raise KeyError(key)
filter = self._m_get_items_filter()
@@ -297,7 +298,7 @@
def __contains__(self, key):
try:
- id = pymongo.objectid.ObjectId(key)
+ id = bson.objectid.ObjectId(key)
except InvalidId:
return False
return self.raw_find_one({'_id': id}, fields=()) is not None
Modified: mongopersist/trunk/versions.cfg
===================================================================
--- mongopersist/trunk/versions.cfg 2013-01-27 19:11:54 UTC (rev 129109)
+++ mongopersist/trunk/versions.cfg 2013-01-29 11:29:20 UTC (rev 129110)
@@ -1,200 +1,215 @@
[versions]
-# Added by Buildout Versions at 2011-09-23 13:05:14.263622
+
+# Added by Buildout Versions at 2013-01-29 12:13:11.941466
buildout-versions = 1.6
-transaction = 1.1.1
+mechanize = 0.2.5
+rwproperty = 1.0
+transaction = 1.3.0
+z3c.coverage = 1.3.1
z3c.recipe.scripts = 1.0.1
zc.recipe.egg = 1.3.2
zc.recipe.testrunner = 1.4.0
+zope.app.appsetup = 3.16.0
+zope.app.testing = 3.10.0
+zope.container = 3.12.0
+zope.contenttype = 3.5.5
+zope.lifecycleevent = 3.7.0
+zope.location = 4.0.0
+zope.testbrowser = 4.0.2
+zope.testing = 4.1.1
# Required by:
-# ZODB3==3.10.3
-# zdaemon==2.0.4
-ZConfig = 2.8.0
+# ZODB3==3.10.5
+# zdaemon==3.0.5
+ZConfig = 2.9.3
# Required by:
-# mongopersist==0.1dev
-ZODB3 = 3.10.3
+# zope.container==3.12.0
+ZODB3 = 3.10.5
# Required by:
-# mongopersist==0.1dev
-pymongo = 2.0.1
+# z3c.coverage==1.3.1
+coverage = 3.5.3
# Required by:
-# mongopersist==0.1dev
-# zope.dottedname==3.4.6
-# zope.exceptions==3.6.1
-# zope.interface==3.6.3
-# zope.testrunner==4.0.3
-setuptools = 0.6c12dev-r88846
+# mongopersist==0.7.3.dev0
+pymongo = 2.4.2
# Required by:
-# ZODB3==3.10.3
-zc.lockfile = 1.0.0
+# zope.i18n==3.8.0
+# zope.testbrowser==4.0.2
+pytz = 2012h
# Required by:
-# ZODB3==3.10.3
-zdaemon = 2.0.4
+# mongopersist==0.7.3.dev0
+repoze.lru = 0.5
# Required by:
-# mongopersist==0.1dev
-zope.dottedname = 3.4.6
+# mongopersist==0.7.3.dev0
+# z3c.coverage==1.3.1
+# zope.app.testing==3.10.0
+# zope.container==3.12.0
+# zope.dottedname==3.4.6
+# zope.exceptions==4.0.3
+# zope.interface==4.0.2
+# zope.testing==4.1.1
+# zope.testrunner==4.0.4
+setuptools = 0.6c12dev-r88846
# Required by:
-# ZODB3==3.10.3
-zope.event = 3.5.0-1
+# ZODB3==3.10.5
+zc.lockfile = 1.0.2
# Required by:
-# zope.testrunner==4.0.3
-zope.exceptions = 3.7.1
+# ZODB3==3.10.5
+zdaemon = 3.0.5
# Required by:
-# mongopersist==0.1dev
-# zope.testrunner==4.0.3
-zope.interface = 3.6.3
+# zope.app.dependable==3.5.1
+# zope.app.testing==3.10.0
+# zope.site==3.9.2
+zope.annotation = 3.5.0
# Required by:
-# zc.recipe.testrunner==1.4.0
-zope.testrunner = 4.0.3
+# zope.app.testing==3.10.0
+zope.app.debug = 3.4.1
-# Added by Buildout Versions at 2011-09-24 09:27:33.494988
-zope.testing = 3.10.2
+# Required by:
+# zope.app.testing==3.10.0
+zope.app.dependable = 3.5.1
-# Added by Buildout Versions at 2011-09-24 22:10:37.470253
-zope.container = 3.12.0
-zope.contenttype = 3.5.3
-zope.lifecycleevent = 3.6.2
-zope.location = 3.9.0
+# Required by:
+# zope.app.testing==3.10.0
+zope.app.publication = 3.14.0
# Required by:
-# zope.i18n==3.7.4
-pytz = 2011g
+# zope.app.publication==3.14.0
+zope.authentication = 4.0.0
# Required by:
# zope.container==3.12.0
zope.broken = 3.6.0
# Required by:
-# zope.publisher==3.12.6
+# zope.publisher==3.13.1
zope.browser = 1.3
# Required by:
# zope.container==3.12.0
-# zope.lifecycleevent==3.6.2
-# zope.publisher==3.12.6
-# zope.security==3.8.2
+# zope.lifecycleevent==3.7.0
+# zope.publisher==3.13.1
+# zope.security==3.8.3
# zope.traversing==3.14.0
-zope.component = 3.10.0
+zope.component = 4.0.1
# Required by:
-# zope.publisher==3.12.6
-zope.configuration = 3.7.4
+# zope.app.appsetup==3.16.0
+# zope.password==3.6.1
+# zope.publisher==3.13.1
+zope.configuration = 4.0.1
# Required by:
+# mongopersist==0.7.3.dev0
# zope.container==3.12.0
-zope.filerepresentation = 3.6.0
+zope.dottedname = 3.4.6
# Required by:
-# zope.publisher==3.12.6
-# zope.traversing==3.14.0
-zope.i18n = 3.7.4
+# zope.app.appsetup==3.16.0
+# zope.app.publication==3.14.0
+zope.error = 4.0.0
# Required by:
+# ZODB3==3.10.5
# zope.container==3.12.0
-# zope.size==3.4.1
-# zope.traversing==3.14.0
-zope.i18nmessageid = 3.5.3
+# zope.lifecycleevent==3.7.0
+# zope.publisher==3.13.1
+zope.event = 4.0.1
# Required by:
-# zope.publisher==3.12.6
-# zope.traversing==3.14.0
-zope.proxy = 3.6.1
+# zope.testrunner==4.0.4
+zope.exceptions = 4.0.3
# Required by:
# zope.container==3.12.0
-zope.publisher = 3.12.6
+zope.filerepresentation = 3.6.1
# Required by:
-# zope.container==3.12.0
-# zope.security==3.8.2
-zope.schema = 3.8.0
+# zope.app.testing==3.10.0
+# zope.publisher==3.13.1
+# zope.traversing==3.14.0
+zope.i18n = 3.8.0
# Required by:
# zope.container==3.12.0
-# zope.publisher==3.12.6
+# zope.size==3.5.0
# zope.traversing==3.14.0
-zope.security = 3.8.2
+zope.i18nmessageid = 4.0.1
# Required by:
+# ZODB3==3.10.5
+# mongopersist==0.7.3.dev0
+# zope.app.testing==3.10.0
# zope.container==3.12.0
-zope.size = 3.4.1
+# zope.exceptions==4.0.3
+# zope.testing==4.1.1
+# zope.testrunner==4.0.4
+zope.interface = 4.0.2
# Required by:
-# zope.container==3.12.0
-zope.traversing = 3.14.0
+# zope.session==3.9.5
+zope.minmax = 1.1.2
-# Added by Buildout Versions at 2011-09-24 23:56:34.485542
-
# Required by:
-# mongopersist==0.1dev
-rwproperty = 1.0
+# zope.app.testing==3.10.0
+zope.password = 3.6.1
-# Added by Buildout Versions at 2011-09-25 03:08:16.489883
-zope.app.appsetup = 3.15.0
-zope.app.testing = 3.8.1
-
# Required by:
-# zope.app.dependable==3.5.1
-# zope.app.testing==3.8.1
-# zope.site==3.9.2
-zope.annotation = 3.5.0
+# zope.app.testing==3.10.0
+zope.processlifetime = 1.0
# Required by:
-# zope.app.testing==3.8.1
-zope.app.debug = 3.4.1
+# zope.annotation==3.5.0
+# zope.publisher==3.13.1
+# zope.traversing==3.14.0
+zope.proxy = 4.0.1
# Required by:
-# zope.app.testing==3.8.1
-zope.app.dependable = 3.5.1
+# zope.app.testing==3.10.0
+# zope.container==3.12.0
+zope.publisher = 3.13.1
# Required by:
-# zope.app.testing==3.8.1
-zope.app.publication = 3.12.0
+# zope.app.testing==3.10.0
+# zope.container==3.12.0
+# zope.filerepresentation==3.6.1
+# zope.security==3.8.3
+zope.schema = 4.2.2
# Required by:
-# zope.app.publication==3.12.0
-zope.authentication = 3.7.1
+# zope.app.testing==3.10.0
+# zope.container==3.12.0
+# zope.publisher==3.13.1
+# zope.traversing==3.14.0
+zope.security = 3.8.3
# Required by:
-# zope.app.appsetup==3.15.0
-# zope.app.publication==3.12.0
-zope.error = 3.7.2
+# zope.app.appsetup==3.16.0
+zope.session = 3.9.5
# Required by:
-# zope.session==3.9.4
-zope.minmax = 1.1.2
+# zope.app.testing==3.10.0
+zope.site = 3.9.2
# Required by:
-# zope.app.testing==3.8.1
-zope.password = 3.6.1
+# zope.container==3.12.0
+zope.size = 3.5.0
# Required by:
-# zope.app.testing==3.8.1
-zope.processlifetime = 1.0
+# zc.recipe.testrunner==1.4.0
+zope.testrunner = 4.0.4
# Required by:
-# zope.app.appsetup==3.15.0
-zope.session = 3.9.4
-
-# Required by:
-# zope.app.testing==3.8.1
-zope.site = 3.9.2
-
-# Added by Buildout Versions at 2011-11-02 11:39:09.460549
-z3c.coverage = 1.2.0
-
-# Added by Buildout Versions at 2012-04-05 11:47:16.836718
-
-# Required by:
-# mongopersist==0.7.1.dev0
-repoze.lru = 0.3
+# zope.app.testing==3.10.0
+# zope.container==3.12.0
+zope.traversing = 3.14.0
More information about the checkins
mailing list