cleanup imports and syntax warnings

pandora/user/models.py

@@ -5,24 +5,25 @@ from datetime import datetime
 
 from django.contrib.auth.models import User
 from django.db import models
-from django.db.models import signals
-from django.dispatch import dispatcher
 from django.conf import settings
 
 from ox.utils import json
 
+
 class UserProfile(models.Model):
     reset_token = models.TextField(blank=True, null=True, unique=True)
     user = models.ForeignKey(User, unique=True)
-    
+
     files_updated = models.DateTimeField(default=datetime.now)
     newsletter = models.BooleanField(default=True)
 
+
 def user_post_save(sender, instance, **kwargs):
     profile, new = UserProfile.objects.get_or_create(user=instance)
 
 models.signals.post_save.connect(user_post_save, sender=User)
-    
+
+
 class Preference(models.Model):
     user = models.ForeignKey(User, related_name='preferences')
     created = models.DateTimeField(auto_now_add=True)
@@ -33,18 +34,20 @@ class Preference(models.Model):
     def __unicode__(self):
         return u"%s/%s=%s" % (self.user, self.key, self.value)
 
+
 def get_user_json(user):
-    json = {}
+    result = {}
     for key in ('username', ):
-        json[key] = getattr(user, key)
-    json['group'] = 'user'
+        result[key] = getattr(user, key)
+    result['group'] = 'user'
     if user.is_staff:
-        json['group'] = 'admin'
+        result['group'] = 'admin'
     elif user.has_perm('0x.vip'): #FIXME: permissions
-        json['group'] = 'vip'
-    json['preferences'] = get_preferences(user)
-    json['ui'] = get_ui(user)
-    return json
+        result['group'] = 'vip'
+    result['preferences'] = get_preferences(user)
+    result['ui'] = get_ui(user)
+    return result
+
 
 def get_ui(user):
     with open(os.path.join(settings.PROJECT_ROOT, 'templates', 'site.json')) as f:
@@ -70,6 +73,7 @@ def get_ui(user):
     }
     '''
 
+
 def get_preferences(user):
     prefs = {}
     for p in Preference.objects.filter(user=user):
@@ -77,6 +81,7 @@ def get_preferences(user):
     prefs['email'] = user.email
     return prefs
 
+
 def get_preference(user, key, value=None):
     if key in ('email', ):
         value = getattr(user, key)
@@ -86,6 +91,7 @@ def get_preference(user, key, value=None):
             value = json.loads(q[0].value)
     return value
 
+
 def set_preference(user, key, value):
     if key in ('email', ):
         setattr(user, key, value)