浏览代码

#185 imports fixed

Alexis CLEMENT 8 年前
父节点
当前提交
9b6cdce778
共有 2 个文件被更改,包括 10 次插入4 次删除
  1. 8 3
      tracim/tracim/controllers/content.py
  2. 2 1
      tracim/tracim/lib/content.py

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

6
 
6
 
7
 from cgi import FieldStorage
7
 from cgi import FieldStorage
8
 import tg
8
 import tg
9
-from tg import tmpl_context, require, predicates
9
+from tg import tmpl_context
10
+from tg import require
11
+from tg import predicates
10
 from tg.i18n import ugettext as _
12
 from tg.i18n import ugettext as _
11
 from tg.predicates import not_anonymous
13
 from tg.predicates import not_anonymous
12
 from sqlalchemy.orm.exc import NoResultFound
14
 from sqlalchemy.orm.exc import NoResultFound
13
 from tg import abort
15
 from tg import abort
14
 
16
 
15
-from tracim.controllers import TIMRestController, StandardController
17
+from tracim.controllers import TIMRestController
18
+from tracim.controllers import StandardController
16
 from tracim.controllers import TIMRestPathContextSetup
19
 from tracim.controllers import TIMRestPathContextSetup
17
 from tracim.controllers import TIMRestControllerWithBreadcrumb
20
 from tracim.controllers import TIMRestControllerWithBreadcrumb
18
 from tracim.controllers import TIMWorkspaceContentRestController
21
 from tracim.controllers import TIMWorkspaceContentRestController
28
 from tracim.lib.predicates import current_user_is_contributor
31
 from tracim.lib.predicates import current_user_is_contributor
29
 from tracim.lib.predicates import current_user_is_content_manager
32
 from tracim.lib.predicates import current_user_is_content_manager
30
 from tracim.lib.predicates import require_current_user_is_owner
33
 from tracim.lib.predicates import require_current_user_is_owner
31
-from tracim.model.serializers import Context, CTX, DictLikeClass
34
+from tracim.model.serializers import Context
35
+from tracim.model.serializers import CTX
36
+from tracim.model.serializers import DictLikeClass
32
 from tracim.model.data import ActionDescription
37
 from tracim.model.data import ActionDescription
33
 from tracim.model import new_revision
38
 from tracim.model import new_revision
34
 from tracim.model import DBSession
39
 from tracim.model import DBSession

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

26
 from tracim.lib import cmp_to_key
26
 from tracim.lib import cmp_to_key
27
 from tracim.lib.notifications import NotifierFactory
27
 from tracim.lib.notifications import NotifierFactory
28
 from tracim.lib.utils import SameValueError
28
 from tracim.lib.utils import SameValueError
29
-from tracim.model import DBSession, new_revision
29
+from tracim.model import DBSession
30
+from tracim.model import new_revision
30
 from tracim.model.auth import User
31
 from tracim.model.auth import User
31
 from tracim.model.data import ActionDescription
32
 from tracim.model.data import ActionDescription
32
 from tracim.model.data import BreadcrumbItem
33
 from tracim.model.data import BreadcrumbItem