PEP8 and deleted the import of the mongodbconnect function in the mongodb datasource

plugins/mongodb_datasource/datasource.py

@@ -11,8 +11,8 @@ import urllib
 
 from lodel import logger
 
-from .utils import mongodbconnect, object_collection_name, \
-    connect, MONGODB_SORT_OPERATORS_MAP, connection_string
+from .utils import object_collection_name, connect, \
+    MONGODB_SORT_OPERATORS_MAP, connection_string
 
 class MongoDbDataSourceError(Exception):
     pass

plugins/mongodb_datasource/main.py

@@ -1,9 +1,11 @@
 from lodel.plugin import LodelHook
 
+
 @LodelHook('mongodb_mh_init')
 def mongodb_migration_handler_init():
     import plugins.mongodb_datasource.migration_handler as migration_handler
 
+
 @LodelHook('mongodb_ds_init')
 def mongodb_datasource_init():
     import plugins.mongodb_datasource.datasource as datasource

plugins/mongodb_datasource/utils.py

@@ -49,9 +49,11 @@ def get_connection_args(connnection_name='default'):
     return connect(host, port, dbname, login, password)
 '''
 
+
 def connection_string(host, port, db_name, username, password):
     return 'mongodb://%s:%s@%s:%s' % (username, password, host, port)
 
+
 def connect(host, port, db_name, username, password):
     connection = MongoClient(
         connection_string(host, port, db_name, username, password))
@@ -59,7 +61,6 @@ def connect(host, port, db_name, username, password):
     return database
 
 
-
 ## @brief Returns a collection name given a EmClass
 # @param class_object EmClass
 # @return str
@@ -72,26 +73,30 @@ def object_collection_name(class_object):
 
     return collection_name
 
-##@brief Determine a collection field name given a lodel2 fieldname
-#@note For the moment this method only return the argument but EVERYWHERE
-#in the datasource we should use this method to gather proper fieldnames
-#@param fieldname str : A lodel2 fieldname
-#@return A string representing a well formated mongodb fieldname
-#@see mongo_filednames
+
+## @brief Determine a collection field name given a lodel2 fieldname
+# @note For the moment this method only return the argument but EVERYWHERE
+# in the datasource we should use this method to gather proper fieldnames
+# @param fieldname str : A lodel2 fieldname
+# @return A string representing a well formated mongodb fieldname
+# @see mongo_filednames
 def mongo_fieldname(fieldname):
     return fieldname
-##@brief Same as mongo_fieldname but for list of fields
+
+
+## @brief Same as mongo_fieldname but for list of fields
 #
-#A small utility function
-#@param fieldnames iterable : contains str only
-#@return a list of converted fildnames (str)
-#@see mongo_fieldname
+# A small utility function
+# @param fieldnames iterable : contains str only
+# @return a list of converted fildnames (str)
+# @see mongo_fieldname
 def mongo_fieldnames(fieldnames):
     return [mongo_fieldname(fname) for fname in fieldnames]
 
+
 ## @brief Returns a list of orting options
 # @param query_filters_order list
 # @return list
 def parse_query_order(query_filters_order):
-    return [    (field, LODEL_SORT_OPERATORS_MAP[direction])
-                for field, direction in query_filters_order]
+    return [(field, LODEL_SORT_OPERATORS_MAP[direction])
+            for field, direction in query_filters_order]