浏览代码

reorganisate lib dir

Guénaël Muller 7 年前
父节点
当前提交
2d7d39751e

+ 1 - 2
tracim/config.py 查看文件

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

+ 3 - 3
tracim/fixtures/content.py 查看文件

4
 from tracim import models
4
 from tracim import models
5
 from tracim.fixtures import Fixture
5
 from tracim.fixtures import Fixture
6
 from tracim.fixtures.users_and_groups import Test
6
 from tracim.fixtures.users_and_groups import Test
7
-from tracim.lib.content import ContentApi
8
-from tracim.lib.userworkspace import RoleApi
9
-from tracim.lib.workspace import WorkspaceApi
7
+from tracim.lib.core.content import ContentApi
8
+from tracim.lib.core.userworkspace import RoleApi
9
+from tracim.lib.core.workspace import WorkspaceApi
10
 from tracim.models.data import ContentType
10
 from tracim.models.data import ContentType
11
 from tracim.models.data import UserRoleInWorkspace
11
 from tracim.models.data import UserRoleInWorkspace
12
 
12
 

+ 1 - 1
tracim/fixtures/users_and_groups.py 查看文件

1
 # -*- coding: utf-8 -*-
1
 # -*- coding: utf-8 -*-
2
 from tracim import models
2
 from tracim import models
3
 from tracim.fixtures import Fixture
3
 from tracim.fixtures import Fixture
4
-from tracim.lib.user import UserApi
4
+from tracim.lib.core.user import UserApi
5
 
5
 
6
 
6
 
7
 class Base(Fixture):
7
 class Base(Fixture):

+ 1 - 0
tracim/lib/core/__init__.py 查看文件

1
+# coding=utf-8

tracim/lib/content.py → tracim/lib/core/content.py 查看文件

15
 import re
15
 import re
16
 import typing
16
 import typing
17
 
17
 
18
-from tracim.translation import fake_translator as _
18
+from tracim.lib.utils.translation import fake_translator as _
19
 
19
 
20
 from depot.manager import DepotManager
20
 from depot.manager import DepotManager
21
 from depot.io.utils import FileIntent
21
 from depot.io.utils import FileIntent
29
 from sqlalchemy import distinct
29
 from sqlalchemy import distinct
30
 from sqlalchemy import or_
30
 from sqlalchemy import or_
31
 from sqlalchemy.sql.elements import and_
31
 from sqlalchemy.sql.elements import and_
32
-from tracim.lib.utils import cmp_to_key
32
+from tracim.lib.utils.utils import cmp_to_key
33
 # from tracim.lib.notifications import NotifierFactory
33
 # from tracim.lib.notifications import NotifierFactory
34
 from tracim.exceptions import SameValueError
34
 from tracim.exceptions import SameValueError
35
-from tracim.lib.utils import current_date_for_filename
35
+from tracim.lib.utils.utils import current_date_for_filename
36
 from tracim.models.revision_protection import new_revision
36
 from tracim.models.revision_protection import new_revision
37
 from tracim.models.auth import User
37
 from tracim.models.auth import User
38
 from tracim.models.data import ActionDescription
38
 from tracim.models.data import ActionDescription

tracim/lib/group.py → tracim/lib/core/group.py 查看文件


tracim/lib/user.py → tracim/lib/core/user.py 查看文件


tracim/lib/userworkspace.py → tracim/lib/core/userworkspace.py 查看文件


tracim/lib/workspace.py → tracim/lib/core/workspace.py 查看文件

3
 
3
 
4
 from sqlalchemy.orm import Query
4
 from sqlalchemy.orm import Query
5
 from sqlalchemy.orm import Session
5
 from sqlalchemy.orm import Session
6
-from tracim.translation import fake_translator as _
6
+from tracim.lib.utils.translation import fake_translator as _
7
 
7
 
8
-from tracim.lib.userworkspace import RoleApi
8
+from tracim.lib.core.userworkspace import RoleApi
9
 from tracim.models.auth import Group
9
 from tracim.models.auth import Group
10
 from tracim.models.auth import User
10
 from tracim.models.auth import User
11
 from tracim.models.data import UserRoleInWorkspace
11
 from tracim.models.data import UserRoleInWorkspace

+ 1 - 0
tracim/lib/utils/__init__.py 查看文件

1
+# coding=utf-8

tracim/logger.py → tracim/lib/utils/logger.py 查看文件


tracim/translation.py → tracim/lib/utils/translation.py 查看文件


tracim/lib/utils.py → tracim/lib/utils/utils.py 查看文件


+ 1 - 2
tracim/models/auth.py 查看文件

12
 import uuid
12
 import uuid
13
 
13
 
14
 from datetime import datetime
14
 from datetime import datetime
15
-from hashlib import md5
16
 from hashlib import sha256
15
 from hashlib import sha256
17
 from typing import TYPE_CHECKING
16
 from typing import TYPE_CHECKING
18
 
17
 
29
 from sqlalchemy.types import Integer
28
 from sqlalchemy.types import Integer
30
 from sqlalchemy.types import Unicode
29
 from sqlalchemy.types import Unicode
31
 
30
 
32
-from tracim.translation import fake_translator as l_
31
+from tracim.lib.utils.translation import fake_translator as l_
33
 from tracim.models.meta import DeclarativeBase
32
 from tracim.models.meta import DeclarativeBase
34
 from tracim.models.meta import metadata
33
 from tracim.models.meta import metadata
35
 if TYPE_CHECKING:
34
 if TYPE_CHECKING:

+ 2 - 5
tracim/models/data.py 查看文件

3
 import json
3
 import json
4
 import os
4
 import os
5
 from datetime import datetime
5
 from datetime import datetime
6
-from typing import TYPE_CHECKING
7
 
6
 
8
 from babel.dates import format_timedelta
7
 from babel.dates import format_timedelta
9
 from bs4 import BeautifulSoup
8
 from bs4 import BeautifulSoup
13
 from sqlalchemy.ext.associationproxy import association_proxy
12
 from sqlalchemy.ext.associationproxy import association_proxy
14
 from sqlalchemy.ext.hybrid import hybrid_property
13
 from sqlalchemy.ext.hybrid import hybrid_property
15
 from sqlalchemy.orm import backref
14
 from sqlalchemy.orm import backref
16
-from sqlalchemy.orm import deferred
17
 from sqlalchemy.orm import relationship
15
 from sqlalchemy.orm import relationship
18
 from sqlalchemy.orm.attributes import InstrumentedAttribute
16
 from sqlalchemy.orm.attributes import InstrumentedAttribute
19
 from sqlalchemy.orm.collections import attribute_mapped_collection
17
 from sqlalchemy.orm.collections import attribute_mapped_collection
20
 from sqlalchemy.types import Boolean
18
 from sqlalchemy.types import Boolean
21
 from sqlalchemy.types import DateTime
19
 from sqlalchemy.types import DateTime
22
 from sqlalchemy.types import Integer
20
 from sqlalchemy.types import Integer
23
-from sqlalchemy.types import LargeBinary
24
 from sqlalchemy.types import Text
21
 from sqlalchemy.types import Text
25
 from sqlalchemy.types import Unicode
22
 from sqlalchemy.types import Unicode
26
 from depot.fields.sqlalchemy import UploadedFileField
23
 from depot.fields.sqlalchemy import UploadedFileField
27
 from depot.fields.upload import UploadedFile
24
 from depot.fields.upload import UploadedFile
28
 from depot.io.utils import FileIntent
25
 from depot.io.utils import FileIntent
29
 
26
 
30
-from tracim.translation import fake_translator as l_
31
-from tracim.translation import get_locale
27
+from tracim.lib.utils.translation import fake_translator as l_
28
+from tracim.lib.utils.translation import get_locale
32
 from tracim.exceptions import ContentRevisionUpdateError
29
 from tracim.exceptions import ContentRevisionUpdateError
33
 from tracim.models.meta import DeclarativeBase
30
 from tracim.models.meta import DeclarativeBase
34
 from tracim.models.auth import User
31
 from tracim.models.auth import User

+ 3 - 3
tracim/tests/__init__.py 查看文件

5
 from pyramid import testing
5
 from pyramid import testing
6
 
6
 
7
 from nose.tools import eq_
7
 from nose.tools import eq_
8
-from tracim.lib.content import ContentApi
9
-from tracim.lib.workspace import WorkspaceApi
8
+from tracim.lib.core.content import ContentApi
9
+from tracim.lib.core.workspace import WorkspaceApi
10
 from tracim.models.data import Workspace, ContentType
10
 from tracim.models.data import Workspace, ContentType
11
 from tracim.models.data import Content
11
 from tracim.models.data import Content
12
-from tracim.logger import logger
12
+from tracim.lib.utils.logger import logger
13
 from tracim.fixtures import FixturesLoader
13
 from tracim.fixtures import FixturesLoader
14
 from tracim.fixtures.users_and_groups import Base as BaseFixture
14
 from tracim.fixtures.users_and_groups import Base as BaseFixture
15
 from tracim.config import CFG
15
 from tracim.config import CFG

+ 6 - 8
tracim/tests/library/test_content_api.py 查看文件

1
 # -*- coding: utf-8 -*-
1
 # -*- coding: utf-8 -*-
2
-import datetime
3
 
2
 
4
 from nose.tools import eq_, ok_
3
 from nose.tools import eq_, ok_
5
 from nose.tools import raises
4
 from nose.tools import raises
6
 
5
 
7
-from depot.io.utils import FileIntent
8
 import transaction
6
 import transaction
9
 
7
 
10
 from tracim.config import CFG
8
 from tracim.config import CFG
11
-from tracim.lib.content import compare_content_for_sorting_by_type_and_name
12
-from tracim.lib.content import ContentApi
9
+from tracim.lib.core.content import compare_content_for_sorting_by_type_and_name
10
+from tracim.lib.core.content import ContentApi
13
 # TODO - G.M - 28-03-2018 - [GroupApi] Re-enable GroupApi
11
 # TODO - G.M - 28-03-2018 - [GroupApi] Re-enable GroupApi
14
-from tracim.lib.group import GroupApi
15
-from tracim.lib.user import UserApi
12
+from tracim.lib.core.group import GroupApi
13
+from tracim.lib.core.user import UserApi
16
 from tracim.exceptions import SameValueError
14
 from tracim.exceptions import SameValueError
17
 # TODO - G.M - 28-03-2018 - [RoleApi] Re-enable RoleApi
15
 # TODO - G.M - 28-03-2018 - [RoleApi] Re-enable RoleApi
18
-from tracim.lib.workspace import RoleApi
16
+from tracim.lib.core.workspace import RoleApi
19
 # TODO - G.M - 28-03-2018 - [WorkspaceApi] Re-enable WorkspaceApi
17
 # TODO - G.M - 28-03-2018 - [WorkspaceApi] Re-enable WorkspaceApi
20
-from tracim.lib.workspace import WorkspaceApi
18
+from tracim.lib.core.workspace import WorkspaceApi
21
 from tracim.models.revision_protection import new_revision
19
 from tracim.models.revision_protection import new_revision
22
 from tracim.models.auth import User
20
 from tracim.models.auth import User
23
 from tracim.models.auth import Group
21
 from tracim.models.auth import Group

+ 1 - 1
tracim/tests/library/test_user_api.py 查看文件

8
 
8
 
9
 import transaction
9
 import transaction
10
 
10
 
11
-from tracim.lib.user import UserApi
11
+from tracim.lib.core.user import UserApi
12
 from tracim.tests import DefaultTest
12
 from tracim.tests import DefaultTest
13
 
13
 
14
 
14
 

+ 5 - 5
tracim/tests/library/test_workspace.py 查看文件

1
 # -*- coding: utf-8 -*-
1
 # -*- coding: utf-8 -*-
2
 from nose.tools import eq_
2
 from nose.tools import eq_
3
 
3
 
4
-from tracim.lib.content import ContentApi
5
-from tracim.lib.group import GroupApi
6
-from tracim.lib.user import UserApi
7
-from tracim.lib.userworkspace import RoleApi
8
-from tracim.lib.workspace import WorkspaceApi
4
+from tracim.lib.core.content import ContentApi
5
+from tracim.lib.core.group import GroupApi
6
+from tracim.lib.core.user import UserApi
7
+from tracim.lib.core.userworkspace import RoleApi
8
+from tracim.lib.core.workspace import WorkspaceApi
9
 from tracim.models import Content
9
 from tracim.models import Content
10
 from tracim.models import User
10
 from tracim.models import User
11
 from tracim.models.auth import Group
11
 from tracim.models.auth import Group

+ 1 - 1
tracim/tests/models/test_content.py 查看文件

10
 
10
 
11
 # from tracim.lib.content import ContentApi
11
 # from tracim.lib.content import ContentApi
12
 from tracim.exceptions import ContentRevisionUpdateError
12
 from tracim.exceptions import ContentRevisionUpdateError
13
-from tracim.lib.content import ContentApi
13
+from tracim.lib.core.content import ContentApi
14
 from tracim.models import Content
14
 from tracim.models import Content
15
 from tracim.models.revision_protection import new_revision
15
 from tracim.models.revision_protection import new_revision
16
 from tracim.models import User
16
 from tracim.models import User