Renamed the package leobject in leapi

leobject/datasources/ledatasourcesql.py → leapi/datasources/ledatasourcesql.py

@@ -3,11 +3,11 @@
 import pymysql
 import copy
 
-import leobject
-from leobject.datasources.dummy import DummyDatasource
-from leobject.leobject import REL_SUB, REL_SUP
+import leapi
+from leapi.datasources.dummy import DummyDatasource
+from leapi.leobject import REL_SUB, REL_SUP
 
-from leobject.letype import LeType
+from leapi.letype import LeType
 
 from mosql.db import Database, all_to_dicts, one_to_dict
 from mosql.query import select, insert, update, delete, join
@@ -261,7 +261,7 @@ class LeDataSourceSQL(DummyDatasource):
     # @param get_sub bool : If True leo is the superior and we want subordinates, else its the opposite
     # @return a list of dict { 'id_relation':.., 'rank':.., 'lesup':.., 'lesub'.., 'rel_attrs': dict() }
     def get_related(self, leo, letype, get_sub=True):
-        if leobject.letype.LeType not in letype.__bases__:
+        if leapi.letype.LeType not in letype.__bases__:
             raise ValueError("letype argument should be a LeType child class, but got %s"%type(letype))
         if not isinstance(leo, LeType):
             raise ValueError("leo argument should be a LeType child class instance but got %s"%type(leo))
@@ -331,7 +331,7 @@ class LeDataSourceSQL(DummyDatasource):
     # @param id_relation int : relation ID
     # @param rank int|str : 'first', 'last', or an integer value
     # @throw ValueError if rank is not valid
-    # @throw leobject.leobject.LeObjectQueryError if id_relation don't exists
+    # @throw leapi.leapi.LeObjectQueryError if id_relation don't exists
     def set_relation_rank(self, id_relation, rank):
         self._check_rank(rank)
         self._set_relation_rank(id_relation, rank)
@@ -343,11 +343,11 @@ class LeDataSourceSQL(DummyDatasource):
     # @warning there is no way to fail on rank parameters even giving very bad parameters, if you want a method that may fail on rank use set_relation_rank() instead
     # @param id_relation int : relation ID
     # @param rank int|str : 'first', 'last', or an integer value
-    # @throw leobject.leobject.LeObjectQueryError if id_relation don't exists
+    # @throw leapi.leapi.LeObjectQueryError if id_relation don't exists
     def _set_relation_rank(self, id_relation, rank):
         ret = self.get_relation(id_relation, no_attr = True)
         if not ret:
-            raise leobject.leobject.LeObjectQueryError("No relation with id_relation = %d"%id_relation)
+            raise leapi.leapi.LeObjectQueryError("No relation with id_relation = %d"%id_relation)
         lesup = ret['lesup']
         lesub = ret['lesup']
         cur_rank = ret['rank']
@@ -447,7 +447,7 @@ class LeDataSourceSQL(DummyDatasource):
             if res['nature'] != None:
                 raise ValueError("The relation with id %d is not a rel2type relation"%id_relation)
 
-            leobj = leobject.lefactory.LeFactory.leobj_from_name('LeObject')
+            leobj = leapi.lefactory.LeFactory.leobj_from_name('LeObject')
             lesup = leobj.uid2leobj(res['id_sup'])
             lesub = leobj.uid2leobj(res['id_sub'])
 
@@ -558,7 +558,7 @@ class LeDataSourceSQL(DummyDatasource):
     # @return A list of LeType ordered by rank that are subordinates of lesup in a "nature" relation
     def get_subordinates(self, lesup, nature):
         with self.connection as cur:
-            id_sup = lesup.lodel_id if isinstance(lesup, leobject.letype.LeType) else MySQL.leroot_lodel_id
+            id_sup = lesup.lodel_id if isinstance(lesup, leapi.letype.LeType) else MySQL.leroot_lodel_id
             sql = select(
                 MySQL.relations_table_name,
                 columns=('id_sup',),

leobject/leclass.py → leapi/leclass.py

@@ -1,6 +1,6 @@
 #-*- coding: utf-8 -*-
 
-import leobject
+import leapi
 
 
 

leobject/lecrud.py → leapi/lecrud.py

@@ -32,16 +32,6 @@ class _LeCrud(object):
     def fieldtypes_internal(self):
         return { fname: ft for fname, ft in cls.fieldtypes().items() if hasattr(ft, 'internal') and ft.internal }
     
-    ## @brief Given a ME uid return the corresponding LeClass or LeType class
-    # @return a LeType or LeClass child class
-    # @throw KeyError if no corresponding child classes
-    @classmethod
-    def uid2leobj(cls, uid):
-        uid = int(uid)
-        if uid not in cls._me_uid:
-            raise KeyError("No LeType or LeClass child classes with uid '%d'"%uid)
-        return cls._me_uid[uid]
-    
     ## @brief Check fields values
     # @param complete bool : If True expect that datas contains all fieldtypes with no default values
     # @param allow_internal bool : If False consider datas as invalid if a value is given for an internal fieldtype

leobject/lefactory.py → leapi/lefactory.py

@@ -24,7 +24,7 @@ class LeFactory(object):
     @staticmethod
     def leobj_from_name(name):
         if LeFactory.modname is None:
-            modname = 'leobject.' + LeFactory.output_file.split('.')[0]
+            modname = 'leapi.' + LeFactory.output_file.split('.')[0]
         else:
             modname = LeFactory.modname
         mod = importlib.import_module(modname)
@@ -141,10 +141,10 @@ class LeFactory(object):
         #Putting import directives in result
         result += """## @author LeFactory
 
-from leobject.lecrud import _LeCrud
-from leobject.leobject import _LeObject
-from leobject.leclass import LeClass
-from leobject.letype import LeType
+from leapi.lecrud import _LeCrud
+from leapi.leobject import _LeObject
+from leapi.leclass import LeClass
+from leapi.letype import LeType
 import EditorialModel.fieldtypes
 """
 
@@ -162,12 +162,12 @@ import %s
 
         result += """
 ## @brief _LeCrud concret class
-# @see leobject.lecrud._LeCrud
+# @see leapi.lecrud._LeCrud
 class LeCrud(_LeCrud):
     _datasource = {ds_classname}(**{ds_kwargs})
 
 ## @brief _LeObject concret class
-# @see leobject.leobject._LeObject
+# @see leapi.leapi._LeObject
 class LeObject(_LeObject, LeCrud):
     _me_uid = {me_uid_l}
 

leobject/leobject.py → leapi/leobject.py

@@ -2,17 +2,17 @@
 
 ## @package leobject API to access lodel datas
 #
-# This package contains abstract classes leobject.leclass.LeClass , leobject.letype.LeType, leobject.leobject._LeObject.
-# Those abstract classes are designed to be mother classes of dynamically generated classes ( see leobject.lefactory.LeFactory )
+# This package contains abstract classes leapi.leclass.LeClass , leapi.letype.LeType, leapi.leapi._LeObject.
+# Those abstract classes are designed to be mother classes of dynamically generated classes ( see leapi.lefactory.LeFactory )
 
-## @package leobject.leobject
+## @package leapi.leobject
 # @brief Abstract class designed to be implemented by LeObject
 #
-# @note LeObject will be generated by leobject.lefactory.LeFactory
+# @note LeObject will be generated by leapi.lefactory.LeFactory
 
 import re
 
-import leobject
+import leapi
 from .lefactory import LeFactory
 import EditorialModel
 from EditorialModel.types import EmType
@@ -24,6 +24,7 @@ REL_SUB = 1
 class _LeObject(object):
     
     ## @brief maps em uid with LeType or LeClass keys are uid values are LeObject childs classes
+    # @todo check if this attribute shouldn't be in _LeCrud
     _me_uid = dict()
 
     ## @brief Instantiate with a Model and a DataSource
@@ -34,6 +35,7 @@ class _LeObject(object):
     ## @brief Given a ME uid return the corresponding LeClass or LeType class
     # @return a LeType or LeClass child class
     # @throw KeyError if no corresponding child classes
+    # @todo check if this method shouldn't be in _LeCrud
     @classmethod
     def uid2leobj(cls, uid):
         uid = int(uid)
@@ -45,7 +47,7 @@ class _LeObject(object):
     # @param datas list : A list a dict with fieldname as key
     # @param cls
     # @return a list of inserted lodel_id
-    # @see leobject.datasources.dummy.DummyDatasource.insert(), leobject.letype.LeType.insert()
+    # @see leapi.datasources.dummy.DummyDatasource.insert(), leapi.letype.LeType.insert()
     @classmethod
     def insert(cls, letype, datas):
         if isinstance(datas, dict):
@@ -64,7 +66,7 @@ class _LeObject(object):
     ## @brief Check if a LeType is a hierarchy root
     @staticmethod
     def is_root(leo):
-        if isinstance(leo, leobject.letype.LeType):
+        if isinstance(leo, leapi.letype.LeType):
             return False
         elif isinstance(leo, LeRoot):
             return True
@@ -332,14 +334,14 @@ class _LeObject(object):
             if isinstance(leclass, str):
                 leclass = LeFactory.leobj_from_name(leclass)
             
-            if not isinstance(leclass, type) or not (leobject.leclass.LeClass in leclass.__bases__) or leclass.__class__ == leobject.leclass.LeClass:
+            if not isinstance(leclass, type) or not (leapi.leclass.LeClass in leclass.__bases__) or leclass.__class__ == leapi.leclass.LeClass:
                 raise ValueError("None | str | LeType child class excpected, but got : '%s' %s"%(leclass,type(leclass)))
 
         if not(letype is None):
             if isinstance(letype, str):
                 letype = LeFactory.leobj_from_name(letype)
 
-            if not isinstance(letype, type) or not leobject.letype.LeType in letype.__bases__ or letype.__class__ == leobject.letype.LeType:
+            if not isinstance(letype, type) or not leapi.letype.LeType in letype.__bases__ or letype.__class__ == leapi.letype.LeType:
                 raise ValueError("None | str | LeType child class excpected, but got : %s"%type(letype))
 
             if leclass is None:
@@ -498,12 +500,12 @@ class LeObjectQueryError(LeObjectError):
 # - Relation can takes two values : superiors or subordinates
 # - Nature is a relation nature ( see EditorialModel.classtypes )
 # Examples : "superiors.parent", "subordinates.translation" etc.
-# @note The field_list arguement of leobject.leobject._LeObject.get() use the same syntax than the FIELD filter part 
+# @note The field_list arguement of leapi.leapi._LeObject.get() use the same syntax than the FIELD filter part 
 # @subsection oppart OPERATOR
 # The OPERATOR part of a filter is a comparison operator. There is
 # - standart comparison operators : = , <, > , <=, >=, !=
 # - list operators : 'in' and 'not in'
-# The list of allowed operators is sotred at leobject.leobject._LeObject._query_operators . 
+# The list of allowed operators is sotred at leapi.leapi._LeObject._query_operators . 
 # @subsection valpart VALUE
 # The VALUE part of a filter is... just a value...
 #
@@ -517,7 +519,7 @@ class LeObjectQueryError(LeObjectError):
 # ( RELATION, NATURE ) where NATURE is a string ( see EditorialModel.classtypes ) and RELATION is one of
 # the defined constant : 
 #
-# - leobject.leobject.REL_SUB for "subordinates"
-# - leobject.leobject.REL_SUP for "superiors"
+# - leapi.leapi.REL_SUB for "subordinates"
+# - leapi.leapi.REL_SUP for "superiors"
 #
 # @note The filters translation process also check if given field are valids compared to the concerned letype and/or the leclass

leobject/letype.py → leapi/letype.py

@@ -2,17 +2,17 @@
 
 ## @package leobject API to access lodel datas
 #
-# This package contains abstract classes leobject.leclass.LeClass , leobject.letype.LeType, leobject.leobject._LeObject.
-# Those abstract classes are designed to be mother classes of dynamically generated classes ( see leobject.lefactory.LeFactory )
+# This package contains abstract classes leapi.leclass.LeClass , leapi.letype.LeType, leapi.leapi._LeObject.
+# Those abstract classes are designed to be mother classes of dynamically generated classes ( see leapi.lefactory.LeFactory )
 
-## @package leobject.leobject
+## @package leapi.leobject
 # @brief Abstract class designed to be implemented by LeObject
 #
-# @note LeObject will be generated by leobject.lefactory.LeFactory
+# @note LeObject will be generated by leapi.lefactory.LeFactory
 
-import leobject
-from leobject.leclass import LeClass
-from leobject.leobject import LeObjectError
+import leapi
+from leapi.leclass import LeClass
+from leapi.leobject import LeObjectError
 
 ## @brief Represent an EmType data instance
 # @note Is not a derivated class of LeClass because the concrete class will be a derivated class from LeClass
@@ -83,7 +83,7 @@ class LeType(object):
     # @return a dict with LeType instance as key and dict{attr_name:attr_val...} as value
     # @todo unit tests
     def linked(self, letype):
-        if leobject.letype.LeType not in letype.__bases__:
+        if leapi.letype.LeType not in letype.__bases__:
             raise ValueError("letype has to be a child class of LeType (not an instance) but %s found"%type(letype))
         
         if letype in self._linked_types.keys():
@@ -96,7 +96,7 @@ class LeType(object):
         return self._datasource.get_related(self, letype, get_sub)
 
     ## @brief Link this object with a LeObject as subordinate
-    # @note shortcut for @ref leobject.leobject._LeObject.link_together()
+    # @note shortcut for @ref leapi.leapi._LeObject.link_together()
     # @param lesub LeObject : The object to be linked with as subordinate
     # @param **rel_attr : keywords arguments for relations attributes
     # @return The relation_id if success else return False
@@ -104,24 +104,24 @@ class LeType(object):
     # @throw LeObkectError if the link already exists
     # @throw AttributeError if an non existing relation attribute is given as argument
     # @throw ValueError if the relation attrivute value check fails
-    # @see leobject.lefactory.LeFactory.link_together()
+    # @see leapi.lefactory.LeFactory.link_together()
     def link(self, leo, **rel_attr):
-        return leobject.lefactory.LeFactory.leobj_from_name('LeObject').link_together(self, leo, **rel_attr)
+        return leapi.lefactory.LeFactory.leobj_from_name('LeObject').link_together(self, leo, **rel_attr)
     
     ## @brief Returns linked subordinates in a rel2type given a wanted LeType child class
     # @param letype LeType(class) : The wanted LeType of result
     # @return A dict with LeType child class instance as key and dict {'id_relation':id, rel_attr_name:rel_attr_value, ...}
     # @throw LeObjectError if the relation is not possible
-    # @see leobject.lefactory.LeFactory.linked_together()
+    # @see leapi.lefactory.LeFactory.linked_together()
     def linked_subordinates(self, letype):
-        return leobject.lefactory.LeFactory.leobj_from_name('LeObject').linked_together(self, letype, True)
+        return leapi.lefactory.LeFactory.leobj_from_name('LeObject').linked_together(self, letype, True)
 
     ## @brief Remove a link with a subordinate
     # @param leo LeType : LeType child instance
     # @return True if a link has been deleted
     # @throw LeObjectError if the relation do not concern the current LeType
     def unlink_subordinate(self, id_relation):
-        return leobject.lefactory.LeFactory.leobj_from_name('LeObject').linked_together(self, leo)
+        return leapi.lefactory.LeFactory.leobj_from_name('LeObject').linked_together(self, leo)
 
     ## @brief Remove a link bewteen this object and another
     # @param leo LeType : LeType child class instance
@@ -143,24 +143,24 @@ class LeType(object):
     # @param replace_if_exists bool : if True delete the old superior and set the new one. If False and there is a superior raise an LeObjectQueryError
     # @return The relation ID or False if fails
     def superior_add(self, leo, nature, rank = 'last', replace_if_exists = False):
-        return leobject.lefactory.LeFactory.leobj_from_name('LeObject').hierarchy_add(leo, self, nature, rank, replace_if_exists)
+        return leapi.lefactory.LeFactory.leobj_from_name('LeObject').hierarchy_add(leo, self, nature, rank, replace_if_exists)
 
     ## @brief Delete a superior given a relation's natue
     # @param leo LeType | LeRoot : The superior to delete
     # @param nature str : The nature of the relation @ref EditorialModel.classtypes
     # @return True if deletion is a success
     def superior_del(self, leo, nature):
-        return leobject.lefactory.leobj_from_name('LeObject').hierarchy_del(leo, self, nature)
+        return leapi.lefactory.leobj_from_name('LeObject').hierarchy_del(leo, self, nature)
     
     ## @brief Fetch superiors by depth
     # @return A list of LeObject ordered by depth (the first is the one with the bigger depth)
     def superiors(self):
-        return leobject.lefactory.leobj_from_name('LeObject').hierarchy_get(self,nature, leo_is_sup = False)
+        return leapi.lefactory.leobj_from_name('LeObject').hierarchy_get(self,nature, leo_is_sup = False)
 
     ## @brief Fetch subordinates ordered by rank
     # @return A list of LeObject ordered by rank
     def subordinates(self):
-        return leobject.lefactory.leobj_from_name('LeObject').hierarchy_get(self,nature, leo_is_sup = True)
+        return leapi.lefactory.leobj_from_name('LeObject').hierarchy_get(self,nature, leo_is_sup = True)
     
     ## @brief Delete a LeType from the datasource
     # @param filters list : list of filters (see @ref leobject_filters)
@@ -170,7 +170,7 @@ class LeType(object):
     # @throw Leo exception if the lodel_id identify an object from another type
     @classmethod
     def delete(cls, filters):
-        return leobject.lefactory.LeFactory.leobject().delete(cls, filters)
+        return leapi.lefactory.LeFactory.leobject().delete(cls, filters)
         
     ## @brief Update a LeType in db
     def db_update(self):
@@ -183,7 +183,7 @@ class LeType(object):
     # @param cls
     # return bool
     def update(cls, filters, datas):
-        return leobject.lefactory.LeFactory.leobject().update(letype = cls, filters = filters, datas = datas)
+        return leapi.lefactory.LeFactory.leobject().update(letype = cls, filters = filters, datas = datas)
         
     ## @brief Insert a new LeType in the datasource
     # @param **datas list : A list of dict containing the datas

leobject/test/test_ledatasourcesql.py → leapi/test/test_ledatasourcesql.py

@@ -4,7 +4,7 @@ import unittest
 import sqlite3
 import pymysql
 from unittest import TestCase
-from leobject.datasources.ledatasourcesql import LeDataSourceSQL
+from leapi.datasources.ledatasourcesql import LeDataSourceSQL
 from mosql.db import Database
 
 

leobject/test/test_lefactory.py → leapi/test/test_lefactory.py

@@ -6,14 +6,14 @@ import sys
 import shutil
 
 import EditorialModel
-import leobject
-import leobject.test.utils
-from leobject.lefactory import LeFactory
+import leapi
+import leapi.test.utils
+from leapi.lefactory import LeFactory
 
 class TestLeFactorySyntax(TestCase):
 
     def test_generated_code_syntax(self):
-        py = LeFactory.generate_python(**leobject.test.utils.genepy_args)
+        py = LeFactory.generate_python(**leapi.test.utils.genepy_args)
         pyc = compile(py, "dyn.py", 'exec')
         exec(pyc, globals())
 
@@ -22,14 +22,14 @@ class TestLeFactory(TestCase):
     @classmethod
     def setUpClass(cls):
         """ Write the generated code in a temporary directory and import it """
-        cls.tmpdir = leobject.test.utils.tmp_load_factory_code()
+        cls.tmpdir = leapi.test.utils.tmp_load_factory_code()
     @classmethod
     def tearDownClass(cls):
         """ Remove the temporary directory created at class setup """
-        leobject.test.utils.cleanup(cls.tmpdir)
+        leapi.test.utils.cleanup(cls.tmpdir)
 
     def setUp(self):
-        backend=leobject.test.utils.genepy_args['backend_cls'](**leobject.test.utils.genepy_args['backend_args'])
+        backend=leapi.test.utils.genepy_args['backend_cls'](**leapi.test.utils.genepy_args['backend_args'])
         self.model = EditorialModel.model.Model(backend = backend)
 
     def test_leobject(self):
@@ -38,11 +38,11 @@ class TestLeFactory(TestCase):
         self.assertTrue(hasattr(dyncode, 'LeObject'))
 
         for uid, cls in dyncode.LeObject._me_uid.items():
-            if leobject.letype.LeType in cls.__bases__:
-                self.assertNotEqual(cls, leobject.letype.LeType)
+            if leapi.letype.LeType in cls.__bases__:
+                self.assertNotEqual(cls, leapi.letype.LeType)
                 self.assertEqual(cls._type_id, uid)
-            elif leobject.leclass.LeClass in cls.__bases__:
-                self.assertNotEqual(cls, leobject.leclass.LeClass)
+            elif leapi.leclass.LeClass in cls.__bases__:
+                self.assertNotEqual(cls, leapi.leclass.LeClass)
                 self.assertEqual(cls._class_id, uid)
             else:
                 self.fail("Bad instance type for _me_uid values : %s"%type(cls))
@@ -60,7 +60,7 @@ class TestLeFactory(TestCase):
             self.assertEqual(leclass._class_id, emclass.uid)
             
             #Testing inheritance
-            self.assertEqual(set(leclass.__bases__), set([dyncode.LeObject, leobject.leclass.LeClass]))
+            self.assertEqual(set(leclass.__bases__), set([dyncode.LeObject, leapi.leclass.LeClass]))
             
             #Testing _linked_types attr
             self.assertEqual(
@@ -95,7 +95,7 @@ class TestLeFactory(TestCase):
             #Testing inheritance
             self.assertEqual(
                 set(letype.__bases__),
-                set([leobject.letype.LeType, letype._leclass])
+                set([leapi.letype.LeType, letype._leclass])
             )
 
             #Testing _fields

leobject/test/test_leobject.py → leapi/test/test_leobject.py

@@ -7,9 +7,9 @@ from unittest import TestCase
 from unittest.mock import patch
 
 import EditorialModel
-import leobject
-import leobject.test.utils
-from leobject.leobject import _LeObject
+import leapi
+import leapi.test.utils
+from leapi.leobject import _LeObject
 
 ## Testing methods that need the generated code
 class LeObjectTestCase(TestCase):
@@ -17,11 +17,11 @@ class LeObjectTestCase(TestCase):
     @classmethod
     def setUpClass(cls):
         """ Write the generated code in a temporary directory and import it """
-        cls.tmpdir = leobject.test.utils.tmp_load_factory_code()
+        cls.tmpdir = leapi.test.utils.tmp_load_factory_code()
     @classmethod
     def tearDownClass(cls):
         """ Remove the temporary directory created at class setup """
-        leobject.test.utils.cleanup(cls.tmpdir)
+        leapi.test.utils.cleanup(cls.tmpdir)
 
     def test_split_query_filter(self):
         """ Tests the _split_filter() classmethod """
@@ -69,9 +69,9 @@ class LeObjectTestCase(TestCase):
         import dyncode
         for i in dyncode.LeObject._me_uid.keys():
             cls = dyncode.LeObject.uid2leobj(i)
-            if leobject.letype.LeType in cls.__bases__:
+            if leapi.letype.LeType in cls.__bases__:
                 self.assertEqual(i, cls._type_id)
-            elif leobject.leclass.LeClass in cls.__bases__:
+            elif leapi.leclass.LeClass in cls.__bases__:
                 self.assertEqual(i, cls._class_id)
             else:
                 self.fail("Bad value returned : '%s'"%cls)
@@ -110,8 +110,8 @@ class LeObjectTestCase(TestCase):
         test_v = [
             ('',''),
             (Personnes, Numero),
-            (leobject.leclass.LeClass, Numero),
-            (Publication, leobject.letype.LeType),
+            (leapi.leclass.LeClass, Numero),
+            (Publication, leapi.letype.LeType),
             ('foobar', Numero),
             (Publication, 'foobar'),
             (Numero, Numero),
@@ -143,7 +143,7 @@ class LeObjectTestCase(TestCase):
         LeObject._check_fields(None, None, EditorialModel.classtypes.common_fields.keys())
 
         #Invalid fields
-        with self.assertRaises(leobject.leobject.LeObjectQueryError):
+        with self.assertRaises(leapi.leobject.LeObjectQueryError):
             LeObject._check_fields(None, None, Numero._fields)
 
     def test_prepare_filters(self):
@@ -158,7 +158,7 @@ class LeObjectTestCase(TestCase):
 
         filt, rfilt = LeObject._prepare_filters(filters, Numero, None)
         self.assertEqual(filt, [('lodel_id', '=', '1')])
-        self.assertEqual(rfilt, [((leobject.leobject.REL_SUP,'parent'), '>', '2')])
+        self.assertEqual(rfilt, [((leapi.leobject.REL_SUP,'parent'), '>', '2')])
         
         #All fields, no relationnal and class given
         filters = []
@@ -179,7 +179,7 @@ class LeObjectTestCase(TestCase):
         
         filt, rfilt = LeObject._prepare_filters(filters, Numero, None)
         self.assertEqual(filt, [('lodel_id', '<=', '0')])
-        self.assertEqual(rfilt, [((leobject.leobject.REL_SUB,'parent'), '=', '2')])
+        self.assertEqual(rfilt, [((leapi.leobject.REL_SUB,'parent'), '=', '2')])
 
     def test_prepare_filters_invalid(self):
         """ Testing the _prepare_filters() method """
@@ -192,7 +192,7 @@ class LeObjectTestCase(TestCase):
             filters.append('%s=1'%field)
             res_filt.append((field, '=', '1'))
         
-        with self.assertRaises(leobject.leobject.LeObjectQueryError):
+        with self.assertRaises(leapi.leobject.LeObjectQueryError):
             LeObject._prepare_filters(filters, None, None)
 
 
@@ -207,13 +207,13 @@ class LeObjectMockDatasourceTestCase(TestCase):
     @classmethod
     def setUpClass(cls):
         """ Write the generated code in a temporary directory and import it """
-        cls.tmpdir = leobject.test.utils.tmp_load_factory_code()
+        cls.tmpdir = leapi.test.utils.tmp_load_factory_code()
     @classmethod
     def tearDownClass(cls):
         """ Remove the temporary directory created at class setup """
-        leobject.test.utils.cleanup(cls.tmpdir)
+        leapi.test.utils.cleanup(cls.tmpdir)
     
-    @patch('leobject.datasources.dummy.DummyDatasource.insert')
+    @patch('leapi.datasources.dummy.DummyDatasource.insert')
     def test_insert(self, dsmock):
         from dyncode import Publication, Numero, LeObject
         ndatas = [
@@ -229,7 +229,7 @@ class LeObjectMockDatasourceTestCase(TestCase):
             dsmock.assert_called_once_with(Numero, Publication, ndats)
             dsmock.reset_mock()
 
-    @patch('leobject.datasources.dummy.DummyDatasource.update')
+    @patch('leapi.datasources.dummy.DummyDatasource.update')
     def test_update(self, dsmock):
         from dyncode import Publication, Numero, LeObject
 
@@ -242,7 +242,7 @@ class LeObjectMockDatasourceTestCase(TestCase):
             (   ['superior.parent in [1,2,3,4,5,6]', 'titre != "FooBar"'],
                 {'titre':'FooBar'},
                 [( 'titre','!=','"FooBar"')],
-                [( (leobject.leobject.REL_SUP, 'parent') ,' in ', '[1,2,3,4,5,6]')]
+                [( (leapi.leobject.REL_SUP, 'parent') ,' in ', '[1,2,3,4,5,6]')]
             ),
         ]
 
@@ -255,7 +255,7 @@ class LeObjectMockDatasourceTestCase(TestCase):
             dsmock.assert_called_once_with(Numero, Publication, ds_filters, ds_relfilters, datas)
             dsmock.reset_mock()
 
-    @patch('leobject.datasources.dummy.DummyDatasource.delete')
+    @patch('leapi.datasources.dummy.DummyDatasource.delete')
     def test_delete(self, dsmock):
         from dyncode import Publication, Numero, LeObject
 
@@ -268,7 +268,7 @@ class LeObjectMockDatasourceTestCase(TestCase):
             (
                 ['subordinate.parent not in [1,2,3]', 'titre = "titre nul"'],
                 [('titre','=', '"titre nul"')],
-                [( (leobject.leobject.REL_SUB, 'parent'), ' not in ', '[1,2,3]')]
+                [( (leapi.leobject.REL_SUB, 'parent'), ' not in ', '[1,2,3]')]
             ),
         ]
 
@@ -281,7 +281,7 @@ class LeObjectMockDatasourceTestCase(TestCase):
             dsmock.assert_called_once_with(Numero, Publication, ds_filters, ds_relfilters)
             dsmock.reset_mock()
         
-    @patch('leobject.datasources.dummy.DummyDatasource.get')
+    @patch('leapi.datasources.dummy.DummyDatasource.get')
     @unittest.skip('Dummy datasource doesn\'t fit anymore')
     def test_get(self, dsmock):
         from dyncode import Publication, Numero, LeObject
@@ -291,7 +291,7 @@ class LeObjectMockDatasourceTestCase(TestCase):
                 ['lodel_id', 'superior.parent'],
                 ['titre != "foobar"'],
 
-                ['lodel_id', (leobject.leobject.REL_SUP, 'parent')],
+                ['lodel_id', (leapi.leobject.REL_SUP, 'parent')],
                 [('titre','!=', '"foobar"')],
                 []
             ),
@@ -299,9 +299,9 @@ class LeObjectMockDatasourceTestCase(TestCase):
                 ['lodel_id', 'titre', 'superior.parent', 'subordinate.translation'],
                 ['superior.parent in  [1,2,3,4,5]'],
 
-                ['lodel_id', 'titre', (leobject.leobject.REL_SUP,'parent'), (leobject.leobject.REL_SUB, 'translation')],
+                ['lodel_id', 'titre', (leapi.leobject.REL_SUP,'parent'), (leapi.leobject.REL_SUB, 'translation')],
                 [],
-                [( (leobject.leobject.REL_SUP, 'parent'), ' in ', '[1,2,3,4,5]')]
+                [( (leapi.leobject.REL_SUP, 'parent'), ' in ', '[1,2,3,4,5]')]
             ),
             (
                 [],
@@ -318,7 +318,7 @@ class LeObjectMockDatasourceTestCase(TestCase):
             dsmock.assert_called_with(Publication, Numero, fl_ds, filters_ds, rfilters_ds)
             dsmock.reset_mock()
 
-    @patch('leobject.datasources.dummy.DummyDatasource.get')
+    @patch('leapi.datasources.dummy.DummyDatasource.get')
     @unittest.skip('Dummy datasource doesn\'t fit anymore')
     def test_get_incomplete_target(self, dsmock):
         """ Testing LeObject.get() method with partial target specifier """

leobject/test/test_letype.py → leapi/test/test_letype.py

@@ -7,26 +7,26 @@ from unittest import TestCase
 from unittest.mock import patch
 
 import EditorialModel
-import leobject
-import leobject.test.utils
+import leapi
+import leapi.test.utils
 
 class LeTypeTestCase(TestCase):
     
     @classmethod
     def setUpClass(cls):
         """ Write the generated code in a temporary directory and import it """
-        cls.tmpdir = leobject.test.utils.tmp_load_factory_code()
+        cls.tmpdir = leapi.test.utils.tmp_load_factory_code()
     @classmethod
     def tearDownClass(cls):
         """ Remove the temporary directory created at class setup """
-        leobject.test.utils.cleanup(cls.tmpdir)
+        leapi.test.utils.cleanup(cls.tmpdir)
  
     def test_init(self):
         """ testing the constructor """
         from dyncode import Publication, Numero, LeObject
         
         with self.assertRaises(NotImplementedError):
-            leobject.letype.LeType(42)
+            leapi.letype.LeType(42)
 
         badargs = [
             {'class_id':Numero._class_id + 1},
@@ -52,10 +52,10 @@ class LeTypeTestCase(TestCase):
         datas = { 'titre':'foobar' }
         Numero.check_datas(datas, False)
         Numero.check_datas(datas, True)
-        with self.assertRaises(leobject.leobject.LeObjectError):
+        with self.assertRaises(leapi.leobject.LeObjectError):
             Numero.check_datas_or_raise({}, True)
 
-    @patch('leobject.letype.LeType.populate')
+    @patch('leapi.letype.LeType.populate')
     def test_datas(self, dsmock):
         """ Testing the datas @property method """
         from dyncode import Publication, Numero, LeObject
@@ -70,13 +70,13 @@ class LeTypeMockDsTestCase(TestCase):
     @classmethod
     def setUpClass(cls):
         """ Write the generated code in a temporary directory and import it """
-        cls.tmpdir = leobject.test.utils.tmp_load_factory_code()
+        cls.tmpdir = leapi.test.utils.tmp_load_factory_code()
     @classmethod
     def tearDownClass(cls):
         """ Remove the temporary directory created at class setup """
-        leobject.test.utils.cleanup(cls.tmpdir)
+        leapi.test.utils.cleanup(cls.tmpdir)
 
-    @patch('leobject.datasources.dummy.DummyDatasource.get')
+    @patch('leapi.datasources.dummy.DummyDatasource.get')
     @unittest.skip('Dummy datasource doesn\'t fit anymore')
     def test_populate(self, dsmock):
         from dyncode import Publication, Numero, LeObject
@@ -86,7 +86,7 @@ class LeTypeMockDsTestCase(TestCase):
         num.populate()
         dsmock.assert_called_once_with(Publication, Numero, missing_fields, [('lodel_id','=','1')],[])
 
-    @patch('leobject.datasources.dummy.DummyDatasource.update')
+    @patch('leapi.datasources.dummy.DummyDatasource.update')
     def test_update(self, dsmock):
         from dyncode import Publication, Numero, LeObject
         
@@ -95,14 +95,14 @@ class LeTypeMockDsTestCase(TestCase):
         Numero.update(['lodel_id = 1'], datas)
         dsmock.assert_called_once_with(Numero, Publication, [('lodel_id','=','1')], [], datas)
 
-    @patch('leobject.datasources.dummy.DummyDatasource.delete')
+    @patch('leapi.datasources.dummy.DummyDatasource.delete')
     def test_delete(self, dsmock):
         from dyncode import Publication, Numero, LeObject
         
         Numero.delete(['lodel_id = 1'])
         dsmock.assert_called_once_with(Numero, Publication, [('lodel_id','=','1')], [])
 
-    @patch('leobject.datasources.dummy.DummyDatasource.update')
+    @patch('leapi.datasources.dummy.DummyDatasource.update')
     def test_db_update(self, dsmock):
         from dyncode import Publication, Numero, LeObject
         
@@ -110,7 +110,7 @@ class LeTypeMockDsTestCase(TestCase):
         num.db_update()
         dsmock.assert_called_once_with(Numero, Publication, [('lodel_id','=','1')], [], num.datas)
 
-    @patch('leobject.datasources.dummy.DummyDatasource.delete')
+    @patch('leapi.datasources.dummy.DummyDatasource.delete')
     def test_db_delete(self, dsmock):
         from dyncode import Publication, Numero, LeObject
 

leobject/test/utils.py → leapi/test/utils.py

@@ -3,10 +3,10 @@ import shutil
 import sys
 
 import EditorialModel
-import leobject
+import leapi
 from EditorialModel.backend.json_backend import EmBackendJson
-from leobject.datasources.dummy import DummyDatasource
-from leobject.lefactory import LeFactory
+from leapi.datasources.dummy import DummyDatasource
+from leapi.lefactory import LeFactory