Fix using a field name different from attribute name

.gitignore

@@ -29,4 +29,7 @@ data
 .mr.developer.cfg
 
 #PyCharm
-.idea/
+.idea/
+
+#Sublime
+*.sublime-*

.travis.yml

@@ -1,11 +1,18 @@
 language: python
 python:
-  - "2.7"
+  #- 2.6
+  - 2.7
+  #- pypy
+  - 3.2
+  - 3.3
+  - 3.4
 
-script:
+install:
+ - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
  - pip install -r requirements-dev.txt
  - make mongo-start
  - make mongo-config
  - python setup.py build
- - make test
 
+script:
+ - make test

README.md

@@ -22,7 +22,7 @@ The next steps are provide support to:
 * authentication
 * nearest preference in replica sets
 * gridfs
-* all python versions (2.5, 2.6, 2.7, 3.2 and PyPy), only python 2.7 is tested now
+* all python versions (2.6, 2.7, 3.2 and PyPy), only python 2.7 is tested now
 
 ## Documentation
 
@@ -69,7 +69,7 @@ class Handler(tornado.web.RequestHandler):
     def get(self):
         user = {'_id': ObjectId(), 'name': 'User Name'}
         yield gen.Task(self.db.user.insert, user)
-        
+
         yield gen.Task(self.db.user.update, user['_id'], {"$set": {'name': 'New User Name'}})
 
         user_found = yield gen.Task(self.db.user.find_one, user['_id'])
@@ -100,10 +100,10 @@ class Handler(tornado.web.RequestHandler):
     @gen.engine
     def get(self):
         user = {'_id': ObjectId()}
-        
+
         # write on primary
         yield gen.Task(self.db.user.insert, user)
-        
+
         # wait for replication
         time.sleep(2)
 

docs/source/installation.rst

@@ -12,7 +12,7 @@ MongoTor supports installation using standard Python "distutils" or
 Install via easy_install or pip
 -------------------------------
 
-When ``easy_install`` or ``pip`` is available, the distribution can be 
+When ``easy_install`` or ``pip`` is available, the distribution can be
 downloaded from Pypi and installed in one step::
 
     easy_install mongotor
@@ -39,17 +39,19 @@ Python prompt like this:
 
 .. sourcecode:: python
 
-     >>> import mongotor 
+     >>> import mongotor
      >>> mongotor.version # doctest: +SKIP
 
 Requirements
 ------------
 
+Python version 2.6+ is required. But only version 2.7 is tested for now.
+
 The following three python libraries are required.
 
   * `pymongo <http://github.com/mongodb/mongo-python-driver>`_ version 1.9+ for bson library
   * `tornado <http://github.com/facebook/tornado>`_
 
 .. note::
    The above requirements are automatically managed when installed using
-   any of the supported installation methods
+   any of the supported installation methods

mongotor/__init__.py

@@ -15,4 +15,4 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-version = "0.1.0"
+version = "0.1.5"

mongotor/client.py

@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
 from bson.code import Code
+import six
 from tornado import gen
 from mongotor.node import ReadPreference
 from mongotor.cursor import Cursor
@@ -291,7 +292,7 @@ def group(self, key, condition, initial, reduce, finalize=None,
         """
 
         group = {}
-        if isinstance(key, basestring):
+        if isinstance(key, six.string_types):
             group["$keyf"] = Code(key)
         elif key is not None:
             group = {"key": helpers._fields_list_to_dict(key)}

mongotor/connection.py

@@ -54,7 +54,7 @@ def _connect(self):
             self._stream.set_close_callback(self._socket_close)
 
             self._connected = True
-        except socket.error, error:
+        except socket.error as error:
             raise InterfaceError(error)
 
     def __repr__(self):
@@ -156,7 +156,7 @@ def reset(self):
     def close_on_error(self):
         try:
             yield
-        except DatabaseError, de:
+        except DatabaseError as de:
             logger.error('database error'.format(de))
             raise
         except Exception:

mongotor/cursor.py

@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import logging
+import six
 from tornado import gen
 from bson import SON
 from mongotor import message
@@ -95,8 +96,8 @@ def find(self, callback=None):
         else:
             callback((response['data'], None))
 
-    @gen.engine
-    def count(self, callback):
+    @gen.coroutine
+    def count(self):
         """Get the size of the results set for this query.
 
         Returns the number of documents in the results set for this query. Does
@@ -110,19 +111,18 @@ def count(self, callback):
         if response and len(response) > 0 and 'n' in response:
             total = int(response['n'])
 
-        callback(total)
+        raise gen.Return(total)
 
-    @gen.engine
-    def distinct(self, key, callback):
+    @gen.coroutine
+    def distinct(self, key):
         """Get a list of distinct values for `key` among all documents
         in the result set of this query.
 
         :Parameters:
           - `key`: name of key for which we want to get the distinct values
         """
-        if not isinstance(key, basestring):
-            raise TypeError("key must be an instance "
-                            "of %s" % (basestring.__name__,))
+        if not isinstance(key, six.string_types):
+            raise TypeError("key must be a string (str/unicode)")
 
         command = {"key": key}
         if self._spec:
@@ -131,7 +131,7 @@ def distinct(self, key, callback):
         response, error = yield gen.Task(self._database.command,
             'distinct', self._collection, **command)
 
-        callback(response['values'])
+        raise gen.Return(response['values'])
 
     def _query_options(self):
         """Get the query options string to use for this query."""

mongotor/database.py

@@ -17,6 +17,7 @@
 
 from functools import partial, wraps
 from datetime import timedelta
+import six
 from tornado import gen
 from tornado.ioloop import IOLoop
 from bson import SON
@@ -29,7 +30,7 @@
 def initialized(fn):
     @wraps(fn)
     def wrapped(self, *args, **kwargs):
-        if not hasattr(self, '_initialized'):
+        if not hasattr(self, '_initialized') or not self._initialized:
             raise DatabaseError("you must be initialize database before perform this action")
 
         return fn(self, *args, **kwargs)
@@ -45,6 +46,7 @@ class Database(object):
     def __new__(cls):
         if not cls._instance:
             cls._instance = super(Database, cls).__new__(cls)
+            cls._initialized = False
 
         return cls._instance
 
@@ -120,10 +122,10 @@ def dbname(self):
 
     @initialized
     def get_collection_name(self, collection):
-        return u'%s.%s' % (self.dbname, collection)
+        return '%s.%s' % (self.dbname, collection)
 
     def _parse_addresses(self, addresses):
-        if isinstance(addresses, (str, unicode)):
+        if isinstance(addresses, six.string_types):
             addresses = [addresses]
 
         assert isinstance(addresses, list)
@@ -152,7 +154,8 @@ def disconnect(cls):
         >>> Database.disconnect()
 
         """
-        if not cls._instance or not hasattr(cls._instance, '_initialized'):
+        if (not cls._instance or not hasattr(cls._instance, '_initialized')
+                or not cls._instance._initialized):
             raise ValueError("Database isn't initialized")
 
         for node in cls._instance._nodes:
@@ -237,7 +240,7 @@ def command(self, command, value=1, read_preference=None,
             be added to the command document before it is sent
 
         """
-        if isinstance(command, basestring):
+        if isinstance(command, six.string_types):
             command = SON([(command, value)])
 
         command.update(kwargs)

mongotor/errors.py

@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-class Error(StandardError):
+class Error(Exception):
     """Base class for all mongotor exceptions.
 
     """

mongotor/helpers.py

@@ -14,6 +14,7 @@
 
 import bson
 import struct
+import six
 from mongotor.errors import (DatabaseError,
     InterfaceError, TimeoutError)
 
@@ -64,7 +65,7 @@ def _check_command_response(response, msg="%s", allowable_errors=[]):
         # Mongos returns the error details in a 'raw' object
         # for some errors.
         if "raw" in response:
-            for shard in response["raw"].itervalues():
+            for shard in six.itervalues(response["raw"]):
                 if not shard.get("ok"):
                     # Just grab the first error...
                     details = shard
@@ -92,8 +93,8 @@ def _fields_list_to_dict(fields):
     """
     as_dict = {}
     for field in fields:
-        if not isinstance(field, basestring):
+        if not isinstance(field, six.string_types):
             raise TypeError("fields must be a list of key names, "
-                            "each an instance of %s" % (basestring.__name__,))
+                            "each an instance of string (str/unicode)")
         as_dict[field] = 1
     return as_dict

mongotor/message.py

@@ -28,7 +28,7 @@
 from mongotor.errors import InvalidOperationError
 
 
-__ZERO = "\x00\x00\x00\x00"
+__ZERO = b"\x00\x00\x00\x00"
 
 
 def __last_error(args):
@@ -57,7 +57,7 @@ def insert(collection_name, docs, check_keys, safe, last_error_args):
     """
     data = __ZERO
     data += bson._make_c_string(collection_name)
-    bson_data = "".join([bson.BSON.encode(doc, check_keys) for doc in docs])
+    bson_data = b"".join([bson.BSON.encode(doc, check_keys) for doc in docs])
     if not bson_data:
         raise InvalidOperationError("cannot do an empty bulk insert")
     data += bson_data

mongotor/node.py

@@ -17,6 +17,7 @@
 
 import logging
 import random
+import six
 from tornado import gen
 from bson import SON
 from mongotor.pool import ConnectionPool
@@ -34,7 +35,7 @@ def __init__(self, host, port, database, pool_kargs=None):
         if not pool_kargs:
             pool_kargs = {}
 
-        assert isinstance(host, (str, unicode))
+        assert isinstance(host, six.string_types)
         assert isinstance(port, int)
 
         self.host = host
@@ -65,7 +66,7 @@ def config(self, callback=None):
                                              connection=connection)
             if not connection._pool:  # if connection is created on the fly
                 connection.close()
-        except InterfaceError, ie:
+        except InterfaceError as ie:
             logger.error('oops, database node {host}:{port} is unavailable: {error}'
                          .format(host=self.host, port=self.port, error=ie))