PYTHON-719 - Fix imports and indentation.

Author: behackett

pymongo/cursor.py

@@ -25,7 +25,9 @@
                             string_type)
 from bson.son import SON
 from pymongo import helpers, message
-from pymongo.read_preferences import ReadPreference, SECONDARY_OK_COMMANDS
+from pymongo.read_preferences import (make_read_preference,
+                                      ReadPreference,
+                                      SECONDARY_OK_COMMANDS)
 from pymongo.errors import (AutoReconnect,
                             CursorNotFound,
                             InvalidOperation)

pymongo/database.py

@@ -27,7 +27,8 @@
                             ConfigurationError,
                             InvalidName,
                             OperationFailure)
-from pymongo.read_preferences import (ReadPreference,
+from pymongo.read_preferences import (make_read_preference,
+                                      ReadPreference,
                                       SECONDARY_OK_COMMANDS)
 
 
@@ -308,7 +309,7 @@ def _command(self, command, value=1,
             orig = make_read_preference(mode, latency, tags)
 
         if command_name not in SECONDARY_OK_COMMANDS:
-             pref = ReadPreference.PRIMARY
+            pref = ReadPreference.PRIMARY
 
         # Special-case: mapreduce can go to secondaries only if inline
         elif command_name == 'mapreduce':