PEP8 fixes (only .py for now)

Signed-off-by: Mike Dirolf <[email protected]>

Author: jbergstroem

pymongo/__init__.py

@@ -45,6 +45,7 @@
 Connection = PyMongo_Connection
 """Alias for :class:`pymongo.connection.Connection`."""
 
+
 def has_c():
     """Is the C extension installed?
 

pymongo/binary.py

@@ -50,6 +50,7 @@
 .. versionadded:: 1.5
 """
 
+
 class Binary(str):
     """Representation of binary data to be stored in or retrieved from MongoDB.
 

pymongo/bson.py

@@ -195,17 +195,17 @@ def _get_long(data, as_class):
     "\x03": _get_object,
     "\x04": _get_array,
     "\x05": _get_binary,
-    "\x06": _get_null, # undefined
+    "\x06": _get_null,  # undefined
     "\x07": _get_oid,
     "\x08": _get_boolean,
     "\x09": _get_date,
     "\x0A": _get_null,
     "\x0B": _get_regex,
     "\x0C": _get_ref,
-    "\x0D": _get_string, # code
-    "\x0E": _get_string, # symbol
+    "\x0D": _get_string,  # code
+    "\x0E": _get_string,  # symbol
     "\x0F": _get_code_w_scope,
-    "\x10": _get_int, # number_int
+    "\x10": _get_int,  # number_int
     "\x11": _get_timestamp,
     "\x12": _get_long,
     "\xFF": lambda x, y: (MinKey(), x),
@@ -297,9 +297,9 @@ def _element_to_bson(key, value, check_keys):
         return "\x08" + name + "\x00"
     if isinstance(value, (int, long)):
         # TODO this is a really ugly way to check for this...
-        if value > 2**64 / 2 - 1 or value < -2**64 / 2:
+        if value > 2 ** 64 / 2 - 1 or value < -2 ** 64 / 2:
             raise OverflowError("MongoDB can only handle up to 8-byte ints")
-        if value > 2**32 / 2 - 1 or value < -2**32 / 2:
+        if value > 2 ** 32 / 2 - 1 or value < -2 ** 32 / 2:
             return "\x12" + name + struct.pack("<q", value)
         return "\x10" + name + struct.pack("<i", value)
     if isinstance(value, datetime.datetime):
@@ -355,8 +355,8 @@ def _dict_to_bson(dict, check_keys, top_level=True):
 
     length = len(elements) + 5
     if length > 4 * 1024 * 1024:
-        raise InvalidDocument("document too large - BSON documents are limited "
-                              "to 4 MB")
+        raise InvalidDocument("document too large - BSON documents are"
+                              "limited to 4 MB")
     return struct.pack("<i", length) + elements + "\x00"
 if _use_c:
     _dict_to_bson = _cbson._dict_to_bson

pymongo/code.py

@@ -15,6 +15,7 @@
 """Tools for representing JavaScript code to be evaluated by MongoDB.
 """
 
+
 class Code(str):
     """JavaScript code to be evaluated by MongoDB.
 

pymongo/collection.py

@@ -481,7 +481,8 @@ def count(self):
         """
         return self.find().count()
 
-    def create_index(self, key_or_list, deprecated_unique=None, ttl=300, **kwargs):
+    def create_index(self, key_or_list, deprecated_unique=None,
+                     ttl=300, **kwargs):
         """Creates an index on this collection.
 
         Takes either a single key or a list of (key, direction) pairs.
@@ -564,7 +565,8 @@ def create_index(self, key_or_list, deprecated_unique=None, ttl=300, **kwargs):
                                               check_keys=False)
         return name
 
-    def ensure_index(self, key_or_list, deprecated_unique=None, ttl=300, **kwargs):
+    def ensure_index(self, key_or_list, deprecated_unique=None,
+                     ttl=300, **kwargs):
         """Ensures that an index exists on this collection.
 
         Takes either a single key or a list of (key, direction) pairs.
@@ -631,7 +633,8 @@ def ensure_index(self, key_or_list, deprecated_unique=None, ttl=300, **kwargs):
 
         if self.__database.connection._cache_index(self.__database.name,
                                                    self.__name, name, ttl):
-            return self.create_index(key_or_list, deprecated_unique, ttl, **kwargs)
+            return self.create_index(key_or_list, deprecated_unique,
+                                     ttl, **kwargs)
         return None
 
     def drop_indexes(self):

pymongo/connection.py

@@ -94,7 +94,7 @@ def return_socket(self):
         self.sock = None
 
 
-class Connection(object): # TODO support auth for pooling
+class Connection(object):  # TODO support auth for pooling
     """Connection to MongoDB.
     """
 
@@ -189,7 +189,8 @@ def __partition(source, sub):
         i = source.find(sub)
         if i == -1:
             return (source, None)
-        return (source[:i], source[i+len(sub):])
+
+        return (source[:i], source[i + len(sub):])
 
     @staticmethod
     def _parse_uri(uri):
@@ -198,7 +199,8 @@ def _parse_uri(uri):
         if uri.startswith("mongodb://"):
             uri = uri[len("mongodb://"):]
         elif "://" in uri:
-            raise InvalidURI("Invalid uri scheme: %s" % Connection.__partition(uri, "://")[0])
+            raise InvalidURI("Invalid uri scheme: %s"
+                             % Connection.__partition(uri, "://")[0])
 
         (hosts, database) = Connection.__partition(uri, "/")
 
@@ -211,7 +213,8 @@ def _parse_uri(uri):
             (auth, hosts) = Connection.__partition(hosts, "@")
 
             if ":" not in auth:
-                raise InvalidURI("auth must be specified as 'username:password@'")
+                raise InvalidURI("auth must be specified as "
+                                 "'username:password@'")
             (username, password) = Connection.__partition(auth, ":")
 
         host_list = []
@@ -441,7 +444,7 @@ def __find_master(self):
                         self.__port = port
                         return
                 except socket.error, e:
-                    sock_error=True
+                    sock_error = True
             finally:
                 if sock is not None:
                     sock.close()
@@ -499,9 +502,10 @@ def set_cursor_manager(self, manager_class):
         """Set this connection's cursor manager.
 
         Raises :class:`TypeError` if `manager_class` is not a subclass of
-        :class:`~pymongo.cursor_manager.CursorManager`. A cursor manager handles
-        closing cursors. Different managers can implement different policies in
-        terms of when to actually kill a cursor that has been closed.
+        :class:`~pymongo.cursor_manager.CursorManager`. A cursor manager
+        handles closing cursors. Different managers can implement different
+        policies in terms of when to actually kill a cursor that has
+        been closed.
 
         :Parameters:
           - `manager_class`: cursor manager to use
@@ -562,7 +566,8 @@ def _send_message(self, message, with_last_error=False):
             # lastError) and raise OperationFailure if it is an error
             # response.
             if with_last_error:
-                response = self.__receive_message_on_socket(1, request_id, sock)
+                response = self.__receive_message_on_socket(1, request_id,
+                                                            sock)
                 return self.__check_response_to_last_error(response)
             return None
         except (ConnectionFailure, socket.error), e:

pymongo/cursor.py

@@ -25,8 +25,7 @@
     "tailable_cursor": 2,
     "slave_okay": 4,
     "oplog_replay": 8,
-    "no_timeout": 16
-}
+    "no_timeout": 16}
 
 
 # TODO might be cool to be able to do find().include("foo") or
@@ -263,13 +262,15 @@ def __getitem__(self, index):
             skip = 0
             if index.start is not None:
                 if index.start < 0:
-                    raise IndexError("Cursor instances do not support negative indices")
+                    raise IndexError("Cursor instances do not support"
+                                     "negative indices")
                 skip = index.start
 
             if index.stop is not None:
                 limit = index.stop - skip
                 if limit <= 0:
-                    raise IndexError("stop index must be greater than start index for slice %r" % index)
+                    raise IndexError("stop index must be greater than start"
+                                     "index for slice %r" % index)
             else:
                 limit = 0
 
@@ -279,14 +280,16 @@ def __getitem__(self, index):
 
         if isinstance(index, (int, long)):
             if index < 0:
-                raise IndexError("Cursor instances do not support negative indices")
+                raise IndexError("Cursor instances do not support negative"
+                                 "indices")
             clone = self.clone()
             clone.skip(index + self.__skip)
-            clone.limit(-1) # use a hard limit
+            clone.limit(-1)  # use a hard limit
             for doc in clone:
                 return doc
             raise IndexError("no such item for Cursor instance")
-        raise TypeError("index %r cannot be applied to Cursor instances" % index)
+        raise TypeError("index %r cannot be applied to Cursor "
+                        "instances" % index)
 
     def max_scan(self, max_scan):
         """Limit the number of documents to scan when performing the query.

pymongo/database.py

@@ -82,8 +82,8 @@ def add_son_manipulator(self, manipulator):
           - `manipulator`: the manipulator to add
         """
         def method_overwritten(instance, method):
-            return getattr(instance, method) != getattr(super(instance.__class__, instance), method)
-
+            return getattr(instance, method) != \
+                getattr(super(instance.__class__, instance), method)
 
         if manipulator.will_copy():
             if method_overwritten(manipulator, "transform_incoming"):
@@ -440,9 +440,10 @@ def add_user(self, name, password):
 
         .. versionadded:: 1.4
         """
+        pwd = helpers._password_digest(name, password)
         self.system.users.update({"user": name},
                                  {"user": name,
-                                  "pwd": helpers._password_digest(name, password)},
+                                  "pwd": pwd},
                                  upsert=True, safe=True)
 
     def remove_user(self, name):
@@ -509,7 +510,8 @@ def authenticate(self, name, password):
         nonce = self.command("getnonce")["nonce"]
         key = helpers._auth_key(nonce, name, password)
         try:
-            self.command("authenticate", user=unicode(name), nonce=nonce, key=key)
+            self.command("authenticate", user=unicode(name),
+                         nonce=nonce, key=key)
             return True
         except OperationFailure:
             return False
@@ -525,9 +527,9 @@ def dereference(self, dbref):
         """Dereference a DBRef, getting the SON object it points to.
 
         Raises TypeError if `dbref` is not an instance of DBRef. Returns a SON
-        object or None if the reference does not point to a valid object. Raises
-        ValueError if `dbref` has a database specified that is different from
-        the current database.
+        object or None if the reference does not point to a valid object.
+        Raises ValueError if `dbref` has a database specified that is different
+        from the current database.
 
         :Parameters:
           - `dbref`: the reference

pymongo/errors.py

@@ -14,6 +14,7 @@
 
 """Exceptions raised by PyMongo."""
 
+
 class PyMongoError(Exception):
     """Base class for all PyMongo exceptions.
 

pymongo/helpers.py

@@ -12,12 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Little bits and pieces used by the driver that don't really fit elsewhere."""
+"""Bits and pieces used by the driver that don't really fit elsewhere."""
 
 try:
     import hashlib
     _md5func = hashlib.md5
-except: # for Python < 2.5
+except:  # for Python < 2.5
     import md5
     _md5func = md5.new
 import struct
@@ -28,6 +28,7 @@
                             AutoReconnect)
 from pymongo.son import SON
 
+
 def _index_list(key_or_list, direction=None):
     """Helper to generate a list of (key, direction) pairs.