Move new_revision contextmanager from tracim.model.data to tracim.model

tracim/tracim/controllers/__init__.py

@@ -16,7 +16,8 @@ from tracim.lib.predicates import current_user_is_contributor
 from tracim.lib.predicates import current_user_is_content_manager
 
 from tracim.model.auth import User
-from tracim.model.data import ActionDescription, new_revision
+from tracim.model.data import ActionDescription
+from tracim.model import new_revision
 from tracim.model.data import BreadcrumbItem
 from tracim.model.data import Content
 from tracim.model.data import ContentType

tracim/tracim/controllers/content.py

@@ -29,7 +29,8 @@ from tracim.lib.predicates import current_user_is_content_manager
 from tracim.lib.predicates import require_current_user_is_owner
 
 from tracim.model.serializers import Context, CTX, DictLikeClass
-from tracim.model.data import ActionDescription, new_revision
+from tracim.model.data import ActionDescription
+from tracim.model import new_revision
 from tracim.model.data import Content
 from tracim.model.data import ContentType
 from tracim.model.data import UserRoleInWorkspace

tracim/tracim/lib/content.py

@@ -18,9 +18,9 @@ from sqlalchemy.sql.elements import and_
 from tracim.lib import cmp_to_key
 from tracim.lib.notifications import NotifierFactory
 from tracim.lib.utils import SameValueError
-from tracim.model import DBSession
+from tracim.model import DBSession, new_revision
 from tracim.model.auth import User
-from tracim.model.data import ActionDescription, new_revision
+from tracim.model.data import ActionDescription
 from tracim.model.data import BreadcrumbItem
 from tracim.model.data import ContentStatus
 from tracim.model.data import ContentRevisionRO

tracim/tracim/model/__init__.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 """The application's model objects"""
+from decorator import contextmanager
 from sqlalchemy import event, inspect
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import scoped_session, sessionmaker
@@ -91,5 +92,22 @@ def prevent_content_revision_delete(session, flush_context, instances):
     for instance in session.deleted:
         if isinstance(instance, ContentRevisionRO) and instance.revision_id is not None:
             raise ContentRevisionDeleteError("ContentRevision is not deletable. You must make a new revision with" +
-                                             "is_deleted set to True. Look at tracim.model.data.new_revision context " +
+                                             "is_deleted set to True. Look at tracim.model.new_revision context " +
                                              "manager to make a new revision")
+
+
+@contextmanager
+def new_revision(content):
+    """
+    Prepare context to update a Content. It will add a new updatable revision to the content.
+    :param content: Content instance to update
+    :return:
+    """
+    with DBSession.no_autoflush:
+        try:
+            if inspect(content.revision).has_identity:
+                content.new_revision()
+            RevisionsIntegrity.add_to_updatable(content.revision)
+            yield content.revision
+        finally:
+            RevisionsIntegrity.remove_from_updatable(content.revision)

tracim/tracim/model/data.py

@@ -7,7 +7,6 @@ from datetime import datetime
 import tg
 from babel.dates import format_timedelta
 from bs4 import BeautifulSoup
-from decorator import contextmanager
 from sqlalchemy import Column, inspect
 from sqlalchemy import ForeignKey
 from sqlalchemy import Sequence
@@ -27,7 +26,7 @@ from sqlalchemy.types import Unicode
 from tg.i18n import lazy_ugettext as l_, ugettext as _
 
 from tracim.lib.exception import ContentRevisionUpdateError
-from tracim.model import DeclarativeBase, DBSession, RevisionsIntegrity
+from tracim.model import DeclarativeBase, RevisionsIntegrity
 from tracim.model.auth import User
 
 
@@ -555,7 +554,7 @@ class ContentRevisionRO(DeclarativeBase):
                 and key in self._cloned_columns \
                 and not RevisionsIntegrity.is_updatable(self):
                 raise ContentRevisionUpdateError(
-                    "Can't modify revision. To work on new revision use tracim.model.data.new_revision " +
+                    "Can't modify revision. To work on new revision use tracim.model.new_revision " +
                     "context manager.")
 
         super().__setattr__(key, value)
@@ -602,7 +601,7 @@ class Content(DeclarativeBase):
 
     # UPDATE A CONTENT
 
-    To update an existing Content, you must use tracim.model.data.new_revision context manager:
+    To update an existing Content, you must use tracim.model.new_revision context manager:
     content = my_sontent_getter_method()
     with new_revision(content):
         content.description = 'foo bar baz'
@@ -1120,23 +1119,6 @@ class Content(DeclarativeBase):
         return url_template.format(wid=wid, fid=fid, ctype=ctype, cid=cid)
 
 
-@contextmanager
-def new_revision(content):
-    """
-    Prepare context to update a Content. It will add a new updatable revision to the content.
-    :param content: Content instance to update
-    :return:
-    """
-    with DBSession.no_autoflush:
-        try:
-            if inspect(content.revision).has_identity:
-                content.new_revision()
-            RevisionsIntegrity.add_to_updatable(content.revision)
-            yield content.revision
-        finally:
-            RevisionsIntegrity.remove_from_updatable(content.revision)
-
-
 class RevisionReadStatus(DeclarativeBase):
 
     __tablename__ = 'revision_read_status'

tracim/tracim/tests/library/test_content_api.py

@@ -12,11 +12,11 @@ from tracim.lib.group import GroupApi
 from tracim.lib.user import UserApi
 from tracim.lib.workspace import RoleApi
 from tracim.lib.workspace import WorkspaceApi
-from tracim.model import DBSession
+from tracim.model import DBSession, new_revision
 
 from tracim.model.auth import Group
 
-from tracim.model.data import ActionDescription, ContentRevisionRO, Workspace, new_revision
+from tracim.model.data import ActionDescription, ContentRevisionRO, Workspace
 from tracim.model.data import Content
 from tracim.model.data import ContentType
 from tracim.model.data import UserRoleInWorkspace

tracim/tracim/tests/models/test_content.py

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
 from nose.tools import raises
-from sqlalchemy.orm import aliased
 from sqlalchemy.sql.elements import and_
 from sqlalchemy.testing import eq_
 
 from tracim.lib.content import ContentApi
 from tracim.lib.exception import ContentRevisionUpdateError
-from tracim.model import DBSession, User, Content
-from tracim.model.data import ContentRevisionRO, Workspace, ActionDescription, ContentType, new_revision
+from tracim.model import DBSession, User, Content, new_revision
+from tracim.model.data import ContentRevisionRO, Workspace, ActionDescription, ContentType
 from tracim.tests import TestStandard