Cleanups, permissions separation into explicit module, absolute import update

apps/history/__init__.py

@@ -1,11 +1,10 @@
+from __future__ import absolute_import
+
 from django.utils.translation import ugettext_lazy as _
 
 from project_tools.api import register_tool
-from permissions.models import PermissionNamespace, Permission
 
-history_namespace = PermissionNamespace('history', _(u'History'))
-
-PERMISSION_HISTORY_VIEW = Permission.objects.register(history_namespace, 'history_view', _(u'Access the history app'))
+from .permissions import PERMISSION_HISTORY_VIEW
 
 # TODO: support permissions AND operand
 # encapsulate into document_history_list and require DOCUMENT_VIEW and HISTORY_VIEW

apps/history/api.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import pickle
 import json
 
@@ -14,8 +16,8 @@ from django.core import serializers
 from django.shortcuts import get_object_or_404
 from django.db import models
 
-from history.models import HistoryType, History
-from history.runtime_data import history_types_dict
+from .models import HistoryType, History
+from .runtime_data import history_types_dict
 
 
 @transaction.commit_manually

apps/history/forms.py

@@ -1,6 +1,8 @@
+from __future__ import absolute_import
+
 from common.forms import DetailForm
 
-from history.models import History
+from .models import History
 
 
 class HistoryDetailForm(DetailForm):

apps/history/models.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import json
 import pickle
 from datetime import datetime
@@ -9,7 +11,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.core import serializers
 
 #from history.managers import HistoryManager
-from history.runtime_data import history_types_dict
+from .runtime_data import history_types_dict
 
 
 class HistoryType(models.Model):

apps/history/permissions.py

@@ -0,0 +1,9 @@
+from __future__ import absolute_import
+
+from django.utils.translation import ugettext_lazy as _
+
+from permissions.models import PermissionNamespace, Permission
+
+history_namespace = PermissionNamespace('history', _(u'History'))
+
+PERMISSION_HISTORY_VIEW = Permission.objects.register(history_namespace, 'history_view', _(u'Access the history app'))

apps/history/views.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
@@ -9,10 +11,10 @@ from django.http import Http404
 from permissions.models import Permission
 from common.utils import encapsulate
 
-from history.models import History
-from history.forms import HistoryDetailForm
-from history import PERMISSION_HISTORY_VIEW
-from history.widgets import history_entry_object_link, history_entry_summary
+from .models import History
+from .forms import HistoryDetailForm
+from .permissions import PERMISSION_HISTORY_VIEW
+from .widgets import history_entry_object_link, history_entry_summary
 
 
 def history_list(request):