PEP8, pylint and django-lint cleanups

apps/documents/metadata.py

@@ -9,12 +9,13 @@ from django.core.exceptions import ObjectDoesNotExist
 
 from models import DocumentMetadata, MetadataType
 
+
 def decode_metadata_from_url(url_dict):
     '''Parses a URL query string to a list of metadata
     '''
     metadata_dict = {
-        'id':{},
-        'value':{}
+        'id': {},
+        'value': {}
     }
     metadata_list = []
     #Match out of order metadata_type ids with metadata values from request
@@ -22,18 +23,18 @@ def decode_metadata_from_url(url_dict):
         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
     for order, identifier in metadata_dict['id'].items():
         if order in metadata_dict['value'].keys():
             metadata_list.append({
-                'id':identifier,
-                'value':metadata_dict['value'][order]
+                'id': identifier,
+                'value': metadata_dict['value'][order]
             })
 
     return metadata_list
-    
-    
+
+
 def save_metadata_list(metadata_list, document):
     '''Takes a list of metadata values and associates a document to it
     '''
@@ -41,7 +42,7 @@ def save_metadata_list(metadata_list, document):
         if item['value']:
             save_metadata(item, document)
         else:
-            #If there is no metadata value, delete the metadata entry 
+            #If there is no metadata value, delete the metadata entry
             #completely from the document
             try:
                 metadata_type = MetadataType.objects.get(id=item['id'])
@@ -52,8 +53,8 @@ def save_metadata_list(metadata_list, document):
                 document_metadata.delete()
             except ObjectDoesNotExist:
                 pass
-                        
-        
+
+
 def save_metadata(metadata_dict, document):
     '''save metadata_dict
     '''
@@ -66,7 +67,7 @@ def save_metadata(metadata_dict, document):
         ),
     )
     #Handle 'plus sign as space' in the url
-    
+
     #unquote_plus handles utf-8?!?
     #http://stackoverflow.com/questions/4382875/handling-iri-in-django
     #.decode('utf-8')
@@ -78,20 +79,17 @@ def metadata_repr(metadata_list):
     '''Return a printable representation of a metadata list
     '''
     return ', '.join(metadata_repr_as_list(metadata_list))
-   
-    
+
+
 def metadata_repr_as_list(metadata_list):
     '''Turn a list of metadata into a list of printable representations
     '''
     output = []
     for metadata_dict in metadata_list:
         try:
-            output.append('%s - %s' % (MetadataType.objects.get(
+            output.append(u'%s - %s' % (MetadataType.objects.get(
                 pk=metadata_dict['id']), metadata_dict.get('value', '')))
         except:
             pass
-        
+
     return output
-    
-    
-