Cleaned up files, removed ununsed imports

apps/common/forms.py

@@ -1,5 +1,4 @@
 from django import forms
-from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 from django.db import models
 

apps/common/views.py

@@ -1,13 +1,11 @@
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _
-from django.contrib import messages
 from django.http import HttpResponseRedirect
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.contrib import messages
 from django.contrib.contenttypes.models import ContentType
 
-from common.utils import generate_choices_w_labels
 from common.forms import ChoiceForm
 
 

apps/documents/forms.py

@@ -298,7 +298,7 @@ class DocumentCreateWizard(BoundFormWizard):
             self.initial = {2: initial_data}
             if not initial_data:
                 # If there is no metadata selected end wizard
-                self.form_list=[DocumentTypeSelectForm, MetadataSelectionForm]
+                self.form_list = [DocumentTypeSelectForm, MetadataSelectionForm]
 
         if isinstance(form, MetadataFormSet):
             for identifier, metadata in enumerate(form.cleaned_data):

apps/grouping/__init__.py

@@ -1,23 +1,11 @@
 from django.utils.translation import ugettext_lazy as _
-#from django.core.urlresolvers import reverse
-#from django.conf import settings
 
-from navigation.api import register_links, register_menu, \
+from navigation.api import register_links
-    register_model_list_columns, register_multi_item_links
-from main.api import register_diagnostic, register_tool
-from permissions.api import register_permissions
-from tags.widgets import get_tags_inline_widget_simple
 
-#from documents.models import Document, DocumentPage, DocumentPageTransformation
-#from documents.staging import StagingFile
-#from documents.conf.settings import ENABLE_SINGLE_DOCUMENT_UPLOAD
 from documents.literals import PERMISSION_DOCUMENT_CREATE, PERMISSION_DOCUMENT_VIEW
-#from documents import document_multiple_clear_transformations
 
 document_group_link = {'text': _(u'group actions'), 'view': 'document_group_view', 'famfam': 'page_go', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_VIEW]}}
 document_group_back_to_document = {'text': _(u'return to document'), 'view': 'document_view_simple', 'args': 'ref_object.id', 'famfam': 'page', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_VIEW]}}
 document_group_create_sibling = {'text': _(u'upload new document using same metadata'), 'view': 'document_create_sibling', 'args': 'ref_object.id', 'famfam': 'page_copy', 'permissions': {'namespace': 'documents', 'permissions': [PERMISSION_DOCUMENT_CREATE]}}
 
-#register_multi_item_links(['document_group_view'], [document_multiple_clear_transformations, document_multiple_delete])
-
 register_links(['document_group_view'], [document_group_back_to_document, document_group_create_sibling], menu_name='sidebar')

apps/grouping/forms.py

@@ -1,27 +1,12 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
-from django.http import HttpResponseRedirect
-from django.utils.http import urlencode
 from django.core.urlresolvers import reverse
 from django.utils.safestring import mark_safe
-from django.forms.formsets import formset_factory
 from django.template.defaultfilters import capfirst
 from django.conf import settings
 
 from tags.widgets import get_tags_inline_widget
-#from common.wizard import BoundFormWizard
-#from common.forms import DetailForm
-#from common.literals import PAGE_SIZE_CHOICES, PAGE_ORIENTATION_CHOICES
-#from common.conf.settings import DEFAULT_PAPER_SIZE
-#from common.conf.settings import DEFAULT_PAGE_ORIENTATION
-#from common.utils import urlquote
-#from metadata.models import MetadataSet, MetadataType
-#from metadata.forms import MetadataFormSet
-
-#from documents.staging import StagingFile
-#from documents.models import Document, DocumentType, \
-#    DocumentPage, DocumentPageTransformation
 
 
 class DocumentGroupImageWidget(forms.widgets.Widget):

apps/grouping/managers.py

@@ -2,7 +2,6 @@ from django.db import models
 from django.db.models import Q
 
 from metadata.classes import MetadataObject
-from metadata.models import DocumentMetadata
 from documents.models import Document
 
 from grouping.literals import INCLUSION_AND, INCLUSION_OR

apps/grouping/models.py

@@ -1,8 +1,6 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from documents.models import Document
-
 from grouping.managers import DocumentGroupManager
 from grouping.literals import OPERATOR_CHOICES, INCLUSION_AND, \
     INCLUSION_CHOICES

apps/grouping/views.py

@@ -6,7 +6,6 @@ from django.template import RequestContext
 
 from documents.literals import PERMISSION_DOCUMENT_VIEW
 from documents.models import Document
-from documents.views import document_list
 from permissions.api import check_permissions
 
 from grouping.models import DocumentGroup

apps/metadata/__init__.py

@@ -1,10 +1,7 @@
 from django.utils.translation import ugettext_lazy as _
 
-from navigation.api import register_links, register_menu, \
+from navigation.api import register_links, register_multi_item_links
-    register_model_list_columns, register_multi_item_links
-from main.api import register_diagnostic, register_tool
 from permissions.api import register_permissions
-
 from documents.models import Document
 
 PERMISSION_METADATA_DOCUMENT_EDIT = u'metadata_document_edit'

apps/metadata/api.py

@@ -3,7 +3,6 @@
 from urllib import unquote_plus
 
 from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext_lazy as _
 
 from metadata.models import DocumentMetadata, MetadataType
 
@@ -39,21 +38,6 @@ def save_metadata_list(metadata_list, document, create=False):
     for item in metadata_list:
         save_metadata(item, document, create)
 
-        #if item['value']:
-        #    save_metadata(item, document)
-        #else:
-        #    #If there is no metadata value, delete the metadata entry
-        #    #completely from the document
-        #    try:
-        #        metadata_type = MetadataType.objects.get(id=item['id'])
-        #        document_metadata = DocumentMetadata.objects.get(
-        #            document=document,
-        #            metadata_type=metadata_type
-        #        )
-        #        document_metadata.delete()
-        #    except ObjectDoesNotExist:
-        #        pass
-
 
 def save_metadata(metadata_dict, document, create=False):
     """save metadata_dict"""

apps/metadata/forms.py

@@ -4,7 +4,7 @@ from django.forms.formsets import formset_factory
 
 from metadata.conf.settings import AVAILABLE_MODELS
 from metadata.conf.settings import AVAILABLE_FUNCTIONS
-from metadata.models import MetadataType, DocumentMetadata
+from metadata.models import MetadataType
 
 
 class MetadataForm(forms.Form):

apps/metadata/views.py

@@ -118,7 +118,6 @@ def metadata_add(request, document_id=None, document_id_list=None):
         messages.error(request, _(u'Must provide at least one document.'))
         return HttpResponseRedirect(request.META.get('HTTP_REFERER', '/'))
 
-    metadata = {}
     for document in documents:
         RecentDocument.objects.add_document_for_user(request.user, document)
 

apps/user_management/__init__.py

@@ -43,9 +43,9 @@ group_multiple_delete = {u'text': _('delete'), 'view': 'group_multiple_delete',
 group_members = {'text': _(u'members'), 'view': 'group_members', 'args': 'object.id', 'famfam': 'group_link', 'permissions': {'namespace': 'user_management', 'permissions': [PERMISSION_GROUP_EDIT]}}
 
 register_links(User, [user_edit, user_set_password, user_delete])
-register_links(['user_multiple_set_password', 'user_set_password', 'user_multiple_delete', 'user_delete', 'user_edit', 'user_list','user_add'], [user_add, user_list], menu_name=u'sidebar')
+register_links(['user_multiple_set_password', 'user_set_password', 'user_multiple_delete', 'user_delete', 'user_edit', 'user_list', 'user_add'], [user_add, user_list], menu_name=u'sidebar')
 register_multi_item_links(['user_list'], [user_multiple_set_password, user_multiple_delete])
 
 register_links(Group, [group_edit, group_members, group_delete])
-register_links(['group_multiple_delete', 'group_delete', 'group_edit', 'group_list','group_add', 'group_members'], [group_add, group_list], menu_name=u'sidebar')
+register_links(['group_multiple_delete', 'group_delete', 'group_edit', 'group_list', 'group_add', 'group_members'], [group_add, group_list], menu_name=u'sidebar')
 register_multi_item_links(['group_list'], [group_multiple_delete])

apps/user_management/views.py

@@ -6,7 +6,6 @@ from django.contrib import messages
 from django.views.generic.list_detail import object_list
 from django.core.urlresolvers import reverse
 from django.contrib.auth.models import User, Group
-from django.contrib.contenttypes.models import ContentType
 
 from permissions.api import check_permissions
 from common.utils import generate_choices_w_labels, two_state_template
@@ -38,7 +37,8 @@ def user_list(request):
                 {
                     'name': _(u'email'),
                     'attribute': 'email'
-                },                {
+                },
+                {
                     'name': _(u'active'),
                     'attribute': lambda x: two_state_template(x.is_active),
                 }