From fb558b1d230167fee20abe73fa82c5213761cf1f Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Sun, 8 Feb 2015 16:22:34 +0100 Subject: [PATCH] Remove unused imports and pep8 errors --- wger/core/tests/test_delete_user.py | 6 ------ wger/core/tests/test_preferences.py | 2 -- wger/core/tests/test_user.py | 6 ------ wger/exercises/models.py | 2 -- wger/exercises/tests/test_submitted_image.py | 3 +-- wger/exercises/views/exercises.py | 1 - wger/manager/pdf.py | 2 -- wger/manager/views/day.py | 1 - wger/manager/views/ical.py | 1 - wger/manager/views/log.py | 2 +- wger/utils/context_processor.py | 1 - wger/utils/fields.py | 11 ----------- wger/utils/tests/test_check_access.py | 2 +- wger/utils/units.py | 2 +- wger/weight/views.py | 2 +- wger/wsgi.py | 2 +- 16 files changed, 6 insertions(+), 40 deletions(-) diff --git a/wger/core/tests/test_delete_user.py b/wger/core/tests/test_delete_user.py index 637a1587a..e90dc04ae 100644 --- a/wger/core/tests/test_delete_user.py +++ b/wger/core/tests/test_delete_user.py @@ -13,16 +13,10 @@ # You should have received a copy of the GNU Affero General Public License import logging -import datetime -import decimal from django.core.urlresolvers import reverse from django.contrib.auth.models import User -from wger.core.models import UserProfile -from wger.core.tests import api_base_test -from wger.utils.constants import TWOPLACES -from wger.weight.models import WeightEntry from wger.manager.tests.testcase import WorkoutManagerTestCase logger = logging.getLogger(__name__) diff --git a/wger/core/tests/test_preferences.py b/wger/core/tests/test_preferences.py index 92153440d..834a73fa3 100644 --- a/wger/core/tests/test_preferences.py +++ b/wger/core/tests/test_preferences.py @@ -18,8 +18,6 @@ import decimal from django.core.urlresolvers import reverse from django.contrib.auth.models import User -from wger.core.models import UserProfile -from wger.core.tests import api_base_test from wger.utils.constants import TWOPLACES from wger.weight.models import WeightEntry diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.py index 25233fad3..033809325 100644 --- a/wger/core/tests/test_user.py +++ b/wger/core/tests/test_user.py @@ -12,15 +12,9 @@ # # You should have received a copy of the GNU Affero General Public License -import datetime - from django.contrib.auth.models import User -from django.contrib.auth.models import Permission -from django.contrib.contenttypes.models import ContentType from django.core.urlresolvers import reverse -from wger.core.models import UserProfile -from wger.gym.models import Gym from wger.manager.tests.testcase import WorkoutManagerTestCase from wger.manager.tests.testcase import WorkoutManagerEditTestCase diff --git a/wger/exercises/models.py b/wger/exercises/models.py index 9ae30d41b..999accc68 100644 --- a/wger/exercises/models.py +++ b/wger/exercises/models.py @@ -30,8 +30,6 @@ from django.core.urlresolvers import reverse from django.core import mail from django.core.cache import cache from django.core.validators import MinLengthValidator -from easy_thumbnails.signals import saved_file -from easy_thumbnails.signal_handlers import generate_aliases from wger.core.models import Language from wger.utils.managers import SubmissionManager diff --git a/wger/exercises/tests/test_submitted_image.py b/wger/exercises/tests/test_submitted_image.py index 88977a45f..1a22f72d8 100644 --- a/wger/exercises/tests/test_submitted_image.py +++ b/wger/exercises/tests/test_submitted_image.py @@ -15,9 +15,8 @@ from django.core import mail from django.core.urlresolvers import reverse -from wger.exercises.models import Exercise, ExerciseImage +from wger.exercises.models import ExerciseImage -from wger.manager.tests.testcase import STATUS_CODES_FAIL from wger.manager.tests.testcase import WorkoutManagerTestCase diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py index f4c3a9a52..1c46922f5 100644 --- a/wger/exercises/views/exercises.py +++ b/wger/exercises/views/exercises.py @@ -23,7 +23,6 @@ from django.http import HttpResponseForbidden from django.forms import ModelForm from django.forms import ModelChoiceField from django.forms import ModelMultipleChoiceField -from django.core import mail from django.core.cache import cache from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse_lazy diff --git a/wger/manager/pdf.py b/wger/manager/pdf.py index a0d4ccaec..d2fc2a63e 100644 --- a/wger/manager/pdf.py +++ b/wger/manager/pdf.py @@ -19,9 +19,7 @@ import datetime from django.http import HttpResponse from django.http import HttpResponseForbidden -from django.core.urlresolvers import reverse from django.shortcuts import get_object_or_404 -from django.contrib.auth.decorators import login_required from django.utils.translation import ugettext as _ from wger.manager.models import Workout diff --git a/wger/manager/views/day.py b/wger/manager/views/day.py index 35aed822c..17b7ccc83 100644 --- a/wger/manager/views/day.py +++ b/wger/manager/views/day.py @@ -19,7 +19,6 @@ import logging from django.shortcuts import render from django.shortcuts import get_object_or_404 from django.http import HttpResponseRedirect -from django.http import HttpResponseForbidden from django.core.urlresolvers import reverse from django.utils.translation import ugettext_lazy from django.utils.translation import ugettext as _ diff --git a/wger/manager/views/ical.py b/wger/manager/views/ical.py index 4a6b8a674..85861a2ec 100644 --- a/wger/manager/views/ical.py +++ b/wger/manager/views/ical.py @@ -25,7 +25,6 @@ from icalendar.tools import UIDGenerator from django.shortcuts import get_object_or_404 from django.http import HttpResponse from django.http import HttpResponseForbidden -from django.contrib.auth.decorators import login_required from django.conf import settings from django.contrib.sites.models import Site diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py index 95ff4e173..90a628ae4 100644 --- a/wger/manager/views/log.py +++ b/wger/manager/views/log.py @@ -170,7 +170,7 @@ def add(request, pk): WorkoutLogFormSet = modelformset_factory(WorkoutLog, form=WorkoutLogForm, exclude=('date', 'workout'), - extra = total_sets) + extra=total_sets) # Process the request if request.method == 'POST': diff --git a/wger/utils/context_processor.py b/wger/utils/context_processor.py index d289dedf9..41c77eada 100644 --- a/wger/utils/context_processor.py +++ b/wger/utils/context_processor.py @@ -14,7 +14,6 @@ # along with Workout Manager. If not, see . from django.conf import settings -from django.core.urlresolvers import reverse from django.templatetags.static import static from wger import get_version diff --git a/wger/utils/fields.py b/wger/utils/fields.py index bea34ede5..f349ff2d5 100644 --- a/wger/utils/fields.py +++ b/wger/utils/fields.py @@ -21,17 +21,6 @@ from wger.utils.widgets import Html5FormTimeField logger = logging.getLogger(__name__) -# -# -# Please note: it is necessary to import these fields with these names, -# otherwise migrating from older versions will not work. Only if the migrations -# are squashed one day (perhaps with django 1.7), can the imports be removed. -# -# -from django.db.models import DecimalField as Html5DecimalField -from django.db.models import FloatField as Html5FloatField -from django.db.models import IntegerField as Html5IntegerField - class Html5TimeField(models.TimeField): ''' diff --git a/wger/utils/tests/test_check_access.py b/wger/utils/tests/test_check_access.py index 3d50ca516..981e43772 100644 --- a/wger/utils/tests/test_check_access.py +++ b/wger/utils/tests/test_check_access.py @@ -16,7 +16,7 @@ from django.contrib.auth.models import User, AnonymousUser from django.http import Http404 from wger.manager.tests.testcase import WorkoutManagerTestCase -from wger.utils.helpers import check_access, make_uid +from wger.utils.helpers import check_access class CheckAccessTestCase(WorkoutManagerTestCase): diff --git a/wger/utils/units.py b/wger/utils/units.py index 9c62e4d1a..7ed03fdb4 100644 --- a/wger/utils/units.py +++ b/wger/utils/units.py @@ -15,7 +15,7 @@ import logging from decimal import Decimal -from wger.utils.constants import TWOPLACES, FOURPLACES +from wger.utils.constants import FOURPLACES logger = logging.getLogger(__name__) diff --git a/wger/weight/views.py b/wger/weight/views.py index b55112f72..9dd4e14ce 100644 --- a/wger/weight/views.py +++ b/wger/weight/views.py @@ -19,7 +19,7 @@ import csv import datetime from django.shortcuts import render -from django.http import HttpResponse, HttpResponseForbidden +from django.http import HttpResponse from django.http import HttpResponseRedirect from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse_lazy diff --git a/wger/wsgi.py b/wger/wsgi.py index 0e8e5b8e7..1531501da 100644 --- a/wger/wsgi.py +++ b/wger/wsgi.py @@ -14,13 +14,13 @@ framework. """ import os +from django.core.wsgi import get_wsgi_application os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION # setting points here. -from django.core.wsgi import get_wsgi_application application = get_wsgi_application() # Apply WSGI middleware here.