reorganisate lib dir

tracim/config.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-from paste.deploy.converters import asbool
 from urllib.parse import urlparse
-from tracim.logger import logger
+from tracim.lib.utils.logger import logger
 from depot.manager import DepotManager
 
 from pyramid.request import Request

tracim/fixtures/content.py

@@ -4,9 +4,9 @@ from depot.io.utils import FileIntent
 from tracim import models
 from tracim.fixtures import Fixture
 from tracim.fixtures.users_and_groups import Test
-from tracim.lib.content import ContentApi
-from tracim.lib.userworkspace import RoleApi
-from tracim.lib.workspace import WorkspaceApi
+from tracim.lib.core.content import ContentApi
+from tracim.lib.core.userworkspace import RoleApi
+from tracim.lib.core.workspace import WorkspaceApi
 from tracim.models.data import ContentType
 from tracim.models.data import UserRoleInWorkspace
 

tracim/fixtures/users_and_groups.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from tracim import models
 from tracim.fixtures import Fixture
-from tracim.lib.user import UserApi
+from tracim.lib.core.user import UserApi
 
 
 class Base(Fixture):

tracim/lib/core/__init__.py

@@ -0,0 +1 @@
+# coding=utf-8

tracim/lib/content.py → tracim/lib/core/content.py

@@ -15,7 +15,7 @@ import datetime
 import re
 import typing
 
-from tracim.translation import fake_translator as _
+from tracim.lib.utils.translation import fake_translator as _
 
 from depot.manager import DepotManager
 from depot.io.utils import FileIntent
@@ -29,10 +29,10 @@ from sqlalchemy import desc
 from sqlalchemy import distinct
 from sqlalchemy import or_
 from sqlalchemy.sql.elements import and_
-from tracim.lib.utils import cmp_to_key
+from tracim.lib.utils.utils import cmp_to_key
 # from tracim.lib.notifications import NotifierFactory
 from tracim.exceptions import SameValueError
-from tracim.lib.utils import current_date_for_filename
+from tracim.lib.utils.utils import current_date_for_filename
 from tracim.models.revision_protection import new_revision
 from tracim.models.auth import User
 from tracim.models.data import ActionDescription

tracim/lib/workspace.py → tracim/lib/core/workspace.py

@@ -3,9 +3,9 @@ import typing
 
 from sqlalchemy.orm import Query
 from sqlalchemy.orm import Session
-from tracim.translation import fake_translator as _
+from tracim.lib.utils.translation import fake_translator as _
 
-from tracim.lib.userworkspace import RoleApi
+from tracim.lib.core.userworkspace import RoleApi
 from tracim.models.auth import Group
 from tracim.models.auth import User
 from tracim.models.data import UserRoleInWorkspace

tracim/lib/utils/__init__.py

@@ -0,0 +1 @@
+# coding=utf-8

tracim/models/auth.py

@@ -12,7 +12,6 @@ import time
 import uuid
 
 from datetime import datetime
-from hashlib import md5
 from hashlib import sha256
 from typing import TYPE_CHECKING
 
@@ -29,7 +28,7 @@ from sqlalchemy.types import DateTime
 from sqlalchemy.types import Integer
 from sqlalchemy.types import Unicode
 
-from tracim.translation import fake_translator as l_
+from tracim.lib.utils.translation import fake_translator as l_
 from tracim.models.meta import DeclarativeBase
 from tracim.models.meta import metadata
 if TYPE_CHECKING:

tracim/models/data.py

@@ -3,7 +3,6 @@ import datetime as datetime_root
 import json
 import os
 from datetime import datetime
-from typing import TYPE_CHECKING
 
 from babel.dates import format_timedelta
 from bs4 import BeautifulSoup
@@ -13,22 +12,20 @@ from sqlalchemy import Sequence
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import backref
-from sqlalchemy.orm import deferred
 from sqlalchemy.orm import relationship
 from sqlalchemy.orm.attributes import InstrumentedAttribute
 from sqlalchemy.orm.collections import attribute_mapped_collection
 from sqlalchemy.types import Boolean
 from sqlalchemy.types import DateTime
 from sqlalchemy.types import Integer
-from sqlalchemy.types import LargeBinary
 from sqlalchemy.types import Text
 from sqlalchemy.types import Unicode
 from depot.fields.sqlalchemy import UploadedFileField
 from depot.fields.upload import UploadedFile
 from depot.io.utils import FileIntent
 
-from tracim.translation import fake_translator as l_
-from tracim.translation import get_locale
+from tracim.lib.utils.translation import fake_translator as l_
+from tracim.lib.utils.translation import get_locale
 from tracim.exceptions import ContentRevisionUpdateError
 from tracim.models.meta import DeclarativeBase
 from tracim.models.auth import User

tracim/tests/__init__.py

@@ -5,11 +5,11 @@ from depot.manager import DepotManager
 from pyramid import testing
 
 from nose.tools import eq_
-from tracim.lib.content import ContentApi
-from tracim.lib.workspace import WorkspaceApi
+from tracim.lib.core.content import ContentApi
+from tracim.lib.core.workspace import WorkspaceApi
 from tracim.models.data import Workspace, ContentType
 from tracim.models.data import Content
-from tracim.logger import logger
+from tracim.lib.utils.logger import logger
 from tracim.fixtures import FixturesLoader
 from tracim.fixtures.users_and_groups import Base as BaseFixture
 from tracim.config import CFG

tracim/tests/library/test_content_api.py

@@ -1,23 +1,21 @@
 # -*- coding: utf-8 -*-
-import datetime
 
 from nose.tools import eq_, ok_
 from nose.tools import raises
 
-from depot.io.utils import FileIntent
 import transaction
 
 from tracim.config import CFG
-from tracim.lib.content import compare_content_for_sorting_by_type_and_name
-from tracim.lib.content import ContentApi
+from tracim.lib.core.content import compare_content_for_sorting_by_type_and_name
+from tracim.lib.core.content import ContentApi
 # TODO - G.M - 28-03-2018 - [GroupApi] Re-enable GroupApi
-from tracim.lib.group import GroupApi
-from tracim.lib.user import UserApi
+from tracim.lib.core.group import GroupApi
+from tracim.lib.core.user import UserApi
 from tracim.exceptions import SameValueError
 # TODO - G.M - 28-03-2018 - [RoleApi] Re-enable RoleApi
-from tracim.lib.workspace import RoleApi
+from tracim.lib.core.workspace import RoleApi
 # TODO - G.M - 28-03-2018 - [WorkspaceApi] Re-enable WorkspaceApi
-from tracim.lib.workspace import WorkspaceApi
+from tracim.lib.core.workspace import WorkspaceApi
 from tracim.models.revision_protection import new_revision
 from tracim.models.auth import User
 from tracim.models.auth import Group

tracim/tests/library/test_user_api.py

@@ -8,7 +8,7 @@ from sqlalchemy.orm.exc import NoResultFound
 
 import transaction
 
-from tracim.lib.user import UserApi
+from tracim.lib.core.user import UserApi
 from tracim.tests import DefaultTest
 
 

tracim/tests/library/test_workspace.py

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 from nose.tools import eq_
 
-from tracim.lib.content import ContentApi
-from tracim.lib.group import GroupApi
-from tracim.lib.user import UserApi
-from tracim.lib.userworkspace import RoleApi
-from tracim.lib.workspace import WorkspaceApi
+from tracim.lib.core.content import ContentApi
+from tracim.lib.core.group import GroupApi
+from tracim.lib.core.user import UserApi
+from tracim.lib.core.userworkspace import RoleApi
+from tracim.lib.core.workspace import WorkspaceApi
 from tracim.models import Content
 from tracim.models import User
 from tracim.models.auth import Group

tracim/tests/models/test_content.py

@@ -10,7 +10,7 @@ import transaction
 
 # from tracim.lib.content import ContentApi
 from tracim.exceptions import ContentRevisionUpdateError
-from tracim.lib.content import ContentApi
+from tracim.lib.core.content import ContentApi
 from tracim.models import Content
 from tracim.models.revision_protection import new_revision
 from tracim.models import User