Clean avatar code

avatar/forms.py

@@ -22,7 +22,6 @@ class UploadAvatarForm(forms.Form):
     avatar = forms.ImageField()
     
     def __init__(self, *args, **kwargs):
-#        self.user = kwargs.pop('user')
         self.emailuser = kwargs.pop('user').email
         super(UploadAvatarForm, self).__init__(*args, **kwargs)
         

avatar/models.py

@@ -34,10 +34,8 @@ def avatar_file_path(instance=None, filename=None, size=None, ext=None):
     tmppath = [AVATAR_STORAGE_DIR]
     if AVATAR_HASH_USERDIRNAMES:
         tmp = md5_constructor(instance.user.username).hexdigest()
-#        tmppath.extend([tmp[0], tmp[1], instance.user.username])
         tmppath.extend([tmp[0], tmp[1], instance.emailuser])
     else:
-#        tmppath.append(instance.user.username)
         tmppath.append(instance.emailuser)
     if not filename:
         # Filename already stored in database
@@ -69,7 +67,6 @@ def find_extension(format):
     return format
 
 class Avatar(models.Model):
-#    user = models.ForeignKey(User)
     emailuser = models.CharField(max_length=255)
     primary = models.BooleanField(default=False)
     avatar = models.ImageField(max_length=1024, upload_to=avatar_file_path, blank=True)

avatar/templatetags/avatar_tags.py

@@ -5,7 +5,6 @@ from django.utils.translation import ugettext as _
 from django.utils.hashcompat import md5_constructor
 from django.core.urlresolvers import reverse
 
-#from django.contrib.auth.models import User
 from seahub.base.accounts import CcnetUser
 from seaserv import get_ccnetuser
 
@@ -38,11 +37,9 @@ def avatar_url(user, size=AVATAR_DEFAULT_SIZE):
 def avatar(user, size=AVATAR_DEFAULT_SIZE):
     if not isinstance(user, CcnetUser):
         try:
-#            user = User.objects.get(username=user)
             user = get_ccnetuser(username=user)
             alt = unicode(user)
             url = avatar_url(user, size)
-#        except User.DoesNotExist:
         except:
             url = get_default_avatar_url()
             alt = _("Default Avatar")

avatar/util.py

@@ -1,7 +1,6 @@
 from django.conf import settings
 from django.core.cache import cache
 
-#from django.contrib.auth.models import User
 from seahub.base.accounts import CcnetUser
 
 from seaserv import get_ccnetuser
@@ -47,10 +46,6 @@ def invalidate_cache(user, size=None):
             cache.delete(get_cache_key(user, size, prefix))
 
 def get_default_avatar_url():
-    """(e.g.)
-    base_url = '/media/'
-    AVATAR_DEFAULT_URL = '/avatars/default.png'
-    """
     base_url = getattr(settings, 'STATIC_URL', None)
     if not base_url:
         base_url = getattr(settings, 'MEDIA_URL', '')
@@ -69,9 +64,7 @@ def get_default_avatar_url():
 def get_primary_avatar(user, size=AVATAR_DEFAULT_SIZE):
     if not isinstance(user, CcnetUser):
         try:
-#            user = User.objects.get(username=user)
             user = get_ccnetuser(username=user)
-#        except User.DoesNotExist:
         except:
             return None
     try:
@@ -79,7 +72,6 @@ def get_primary_avatar(user, size=AVATAR_DEFAULT_SIZE):
         # it will be first, and then ordered by date uploaded, otherwise a
         # primary=False avatar will be first.  Exactly the fallback behavior we
         # want.
-#        avatar = user.avatar_set.order_by("-primary", "-date_uploaded")[0]
         from seahub.avatar.models import Avatar
         avatar = Avatar.objects.filter(emailuser=user.email, primary=1)[0]
     except IndexError:

avatar/views.py

@@ -36,7 +36,6 @@ def _get_next(request):
 
 def _get_avatars(user):
     # Default set. Needs to be sliced, but that's it. Keep the natural order.
-#    avatars = user.avatar_set.all()
     avatars = Avatar.objects.filter(emailuser=user.email)
     
     # Current avatar