[Checkins] SVN: mongopersist/trunk/ - Switch to pymongo.MongoClient, set default write concern values,

[Adam Groszer]

Log message for revision 129218:
  - Switch to pymongo.MongoClient, set default write concern values,
    allow override of write concern values

Changed:
  U   mongopersist/trunk/CHANGES.txt
  U   mongopersist/trunk/src/mongopersist/pool.py

-=-
Modified: mongopersist/trunk/CHANGES.txt
===================================================================
--- mongopersist/trunk/CHANGES.txt	2013-02-08 10:18:50 UTC (rev 129217)
+++ mongopersist/trunk/CHANGES.txt	2013-02-08 10:46:31 UTC (rev 129218)
@@ -5,7 +5,8 @@
 0.7.6 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Switch to pymongo.MongoClient, set default write concern values,
+  allow override of write concern values
 
 
 0.7.5 (2013-02-06)

Modified: mongopersist/trunk/src/mongopersist/pool.py
===================================================================
--- mongopersist/trunk/src/mongopersist/pool.py	2013-02-08 10:18:50 UTC (rev 129217)
+++ mongopersist/trunk/src/mongopersist/pool.py	2013-02-08 10:46:31 UTC (rev 129218)
@@ -33,10 +33,10 @@
     """
     zope.interface.implements(interfaces.IMongoConnectionPool)
 
-    _mongoConnectionFactory = pymongo.Connection
+    _mongoConnectionFactory = pymongo.MongoClient
 
     def __init__(self, host='localhost', port=27017, logLevel=20,
-        tz_aware=True, connectionFactory=None):
+        tz_aware=True, w=1, j=True, connectionFactory=None):
         self.host = host
         self.port = port
         self.key = 'mongopersist-%s-%s' %(self.host, self.port)
@@ -44,6 +44,8 @@
         if connectionFactory is not None:
             self._mongoConnectionFactory = connectionFactory
         self.logLevel = logLevel
+        self.w = w
+        self.j = j
 
     @property
     def storage(self):
@@ -60,7 +62,8 @@
         conn = self.storage.get(self.key, None)
         if conn is None:
             self.storage[self.key] = conn = self._mongoConnectionFactory(
-                self.host, self.port, tz_aware=self.tz_aware)
+                self.host, self.port, tz_aware=self.tz_aware,
+                w=self.w, j=self.j)
             if self.logLevel:
                 log.log(self.logLevel, "Create connection for %s:%s" % (
                     self.host, self.port))
@@ -74,8 +77,9 @@
     zope.interface.implements(interfaces.IMongoDataManagerProvider)
 
     def __init__(self, host='localhost', port=27017,
-                 logLevel=20, tz_aware=True, **dm_kwargs):
-        self.pool = MongoConnectionPool(host, port, logLevel, tz_aware)
+                 logLevel=20, tz_aware=True, w=1, j=True,
+                 **dm_kwargs):
+        self.pool = MongoConnectionPool(host, port, logLevel, tz_aware, w, j)
         self.dm_kwargs = dm_kwargs
 
     def get(self):