Misc cleanups, PEP8, conding conventions, spaces, unused imports, False/True comparisons

apps/metadata/__init__.py

@@ -5,7 +5,6 @@ from django.utils.translation import ugettext_lazy as _
 from acls.api import class_permissions
 from common.utils import encapsulate
 from documents.models import Document, DocumentType
-from documents.permissions import PERMISSION_DOCUMENT_TYPE_EDIT
 from navigation.api import (register_links, register_multi_item_links,
     register_sidebar_template, register_model_list_columns)
 from project_setup.api import register_setup
@@ -20,11 +19,7 @@ from .links import (metadata_edit, metadata_view, metadata_multiple_edit,
 from .models import MetadataType, MetadataSet
 from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT,
     PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_REMOVE,
-    PERMISSION_METADATA_DOCUMENT_VIEW, PERMISSION_METADATA_TYPE_EDIT,
-    PERMISSION_METADATA_TYPE_CREATE, PERMISSION_METADATA_TYPE_DELETE,
-    PERMISSION_METADATA_TYPE_VIEW, PERMISSION_METADATA_SET_EDIT,
-    PERMISSION_METADATA_SET_CREATE, PERMISSION_METADATA_SET_DELETE,
-    PERMISSION_METADATA_SET_VIEW)
+    PERMISSION_METADATA_DOCUMENT_VIEW)
 
 register_links(['metadata_add', 'metadata_edit', 'metadata_remove', 'metadata_view'], [metadata_add, metadata_edit, metadata_remove], menu_name='sidebar')
 register_links(Document, [metadata_view], menu_name='form_header')
@@ -52,7 +47,7 @@ class_permissions(Document, [
 ])
 
 register_model_list_columns(Document, [
-        {'name':_(u'metadata'), 'attribute':
+        {'name': _(u'metadata'), 'attribute':
             encapsulate(lambda x: get_metadata_string(x))
         },
     ])

apps/metadata/api.py

@@ -17,13 +17,13 @@ def decode_metadata_from_url(url_dict):
         'value': {}
     }
     metadata_list = []
-    #Match out of order metadata_type ids with metadata values from request
+    # Match out of order metadata_type ids with metadata values from request
     for key, value in url_dict.items():
         if 'metadata' in key:
             index, element = key[8:].split('_')
             metadata_dict[element][index] = value
 
-    #Convert the nested dictionary into a list of id+values dictionaries
+    # Convert the nested dictionary into a list of id+values dictionaries
     for order, identifier in metadata_dict['id'].items():
         if order in metadata_dict['value'].keys():
             metadata_list.append({
@@ -74,7 +74,7 @@ def save_metadata(metadata_dict, document, create=False):
 
     # unquote_plus handles utf-8?!?
     # http://stackoverflow.com/questions/4382875/handling-iri-in-django
-    #.decode('utf-8')
+    # .decode('utf-8')
     if document_metadata:
         document_metadata.value = unquote_plus(metadata_dict['value'])
         document_metadata.save()
@@ -117,5 +117,5 @@ def convert_dict_to_dict_list(dictionary):
         except MetadataType.DoesNotExist:
             raise ValueError('Unknown metadata type name')
         result.append({'id': metadata_type.pk, 'value': value})
-    
+
     return result

apps/metadata/forms.py

@@ -14,20 +14,20 @@ class MetadataForm(forms.Form):
     def __init__(self, *args, **kwargs):
         super(MetadataForm, self).__init__(*args, **kwargs)
 
-        #Set form fields initial values
+        # Set form fields initial values
         if 'initial' in kwargs:
             self.metadata_type = kwargs['initial'].pop('metadata_type', None)
-            #self.document_type = kwargs['initial'].pop('document_type', None)
+            # self.document_type = kwargs['initial'].pop('document_type', None)
 
             # FIXME:
-            #required = self.document_type.documenttypemetadatatype_set.get(metadata_type=self.metadata_type).required
+            # required = self.document_type.documenttypemetadatatype_set.get(metadata_type=self.metadata_type).required
             required = False
             required_string = u''
             if required:
                 self.fields['value'].required = True
                 required_string = ' (%s)' % _(u'required')
             else:
-                #TODO: FIXME: not working correctly
+                # TODO: FIXME: not working correctly
                 self.fields['value'].required = False
 
             self.fields['name'].initial = '%s%s' % ((self.metadata_type.title if self.metadata_type.title else self.metadata_type.name), required_string)
@@ -71,7 +71,7 @@ class MetadataRemoveForm(MetadataForm):
 
 class MetadataSelectionForm(forms.Form):
     def __init__(self, *args, **kwargs):
-        #document_type = kwargs.pop('document_type', None)
+        # document_type = kwargs.pop('document_type', None)
         super(MetadataSelectionForm, self).__init__(*args, **kwargs)
         document_type = getattr(self, 'initial', {}).get('document_type', None)
         if document_type:
@@ -86,7 +86,7 @@ class MetadataSelectionForm(forms.Form):
         queryset=MetadataSet.objects.all(),
         label=_(u'Metadata sets'),
         required=False,
-        #widget=forms.widgets.SelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
+        # widget=forms.widgets.SelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
         widget=ScrollableCheckboxSelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
     )
 
@@ -94,7 +94,7 @@ class MetadataSelectionForm(forms.Form):
         queryset=MetadataType.objects.all(),
         label=_(u'Metadata'),
         required=False,
-        #widget=forms.widgets.SelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
+        # widget=forms.widgets.SelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
         widget=ScrollableCheckboxSelectMultiple(attrs={'size': 10, 'class': 'choice_form'})
     )
 

apps/metadata/models.py

@@ -24,7 +24,7 @@ class MetadataType(models.Model):
     lookup = models.TextField(blank=True, null=True,
         verbose_name=_(u'lookup'),
         help_text=_(u'Enter a string to be evaluated.  Example: [user.get_full_name() for user in User.objects.all()].%s') % available_models_string)
-    #TODO: datatype?
+    # TODO: datatype?
 
     objects = MetadataTypeManager()
 
@@ -67,7 +67,7 @@ class MetadataSetItem(models.Model):
     """
     metadata_set = models.ForeignKey(MetadataSet, verbose_name=_(u'metadata set'))
     metadata_type = models.ForeignKey(MetadataType, verbose_name=_(u'metadata type'))
-    #required = models.BooleanField(default=True, verbose_name=_(u'required'))
+    # required = models.BooleanField(default=True, verbose_name=_(u'required'))
 
     def __unicode__(self):
         return unicode(self.metadata_type)

apps/metadata/views.py

@@ -165,7 +165,7 @@ def metadata_add(request, document_id=None, document_id_list=None):
         form = AddMetadataForm()
 
     context = {
-        #'form_display_mode_table': True,
+        # 'form_display_mode_table': True,
         'form': form,
         'next': next,
     }
@@ -309,7 +309,7 @@ def setup_metadata_type_edit(request, metadatatype_id):
     if request.method == 'POST':
         form = MetadataTypeForm(instance=metadata_type, data=request.POST)
         if form.is_valid():
-            #folder.title = form.cleaned_data['title']
+            # folder.title = form.cleaned_data['title']
             try:
                 form.save()
                 messages.success(request, _(u'Metadata type edited successfully'))
@@ -510,7 +510,6 @@ def setup_metadata_set_delete(request, metadata_set_id):
                 'metadata_set': metadata_set, 'error': e})
             return HttpResponseRedirect(previous)
 
-
     context = {
         'object_name': _(u'metadata set'),
         'delete_view': True,