diff --git a/avatar/__init__.py b/avatar/__init__.py index bfb1c2b..7ed5bc6 100644 --- a/avatar/__init__.py +++ b/avatar/__init__.py @@ -4,6 +4,7 @@ from django.conf import settings try: from PIL import Image + dir(Image) # Placate PyFlakes except ImportError: import Image @@ -22,7 +23,6 @@ AVATAR_HASH_USERDIRNAMES = getattr(settings, 'AVATAR_HASH_USERDIRNAMES', False) AVATAR_ALLOWED_FILE_EXTS = getattr(settings, 'AVATAR_ALLOWED_FILE_EXTS', None) from django.db.models import signals -from django.contrib.auth.models import User from avatar.models import Avatar diff --git a/avatar/management/commands/rebuild_avatars.py b/avatar/management/commands/rebuild_avatars.py index 28b64ad..dee4238 100644 --- a/avatar/management/commands/rebuild_avatars.py +++ b/avatar/management/commands/rebuild_avatars.py @@ -1,5 +1,4 @@ from django.core.management.base import NoArgsCommand -from django.conf import settings from avatar.models import Avatar from avatar import AUTO_GENERATE_AVATAR_SIZES diff --git a/avatar/models.py b/avatar/models.py index 5298c51..c428d5c 100644 --- a/avatar/models.py +++ b/avatar/models.py @@ -9,17 +9,20 @@ from django.utils.hashcompat import md5_constructor try: from cStringIO import StringIO + dir(StringIO) # Placate PyFlakes except ImportError: from StringIO import StringIO try: from PIL import Image + dir(Image) # Placate PyFlakes except ImportError: import Image from avatar import AVATAR_STORAGE_DIR, AVATAR_RESIZE_METHOD, \ AVATAR_MAX_AVATARS_PER_USER, AVATAR_THUMB_FORMAT, \ - AVATAR_HASH_USERDIRNAMES, AVATAR_HASH_FILENAMES + AVATAR_HASH_USERDIRNAMES, AVATAR_HASH_FILENAMES, \ + AVATAR_DEFAULT_URL def avatar_file_path(instance=None, filename=None, size=None, ext=None): tmppath = [AVATAR_STORAGE_DIR] diff --git a/avatar/tests.py b/avatar/tests.py index 9a81f5c..649bacd 100644 --- a/avatar/tests.py +++ b/avatar/tests.py @@ -1,19 +1,15 @@ -import unittest import os.path from django.test import TestCase from django.test.client import Client from django.contrib.auth.models import User from django.core.urlresolvers import reverse -from django.conf import settings - -import avatar try: from PIL import Image + dir(Image) # Placate PyFlakes except ImportError: import Image -from models import * class AvatarUploadTests(TestCase): diff --git a/avatar/views.py b/avatar/views.py index e1ca1e6..c685fb8 100644 --- a/avatar/views.py +++ b/avatar/views.py @@ -1,8 +1,6 @@ -import os.path - -from avatar.models import Avatar, avatar_file_path, get_primary_avatar +from avatar.models import Avatar, get_primary_avatar from avatar.forms import PrimaryAvatarForm, DeleteAvatarForm, UploadAvatarForm -from django.http import HttpResponseRedirect, HttpResponse +from django.http import HttpResponseRedirect from django.shortcuts import render_to_response from django.template import RequestContext from django.contrib.auth.decorators import login_required