Self hosted FLOSS fitness/workout, nutrition and weight tracker
Correct further flake8 linting errors
Roland Geider8d07da1f100d
diff --git a/wger/exercises/admin.py b/wger/exercises/admin.pyindex 92071fa1a..02e41b9eb 100644--- a/wger/exercises/admin.py+++ b/wger/exercises/admin.py@@ -30,6 +30,7 @@ class ExerciseAdmin(admin.ModelAdmin):inlines = [ExerciseCommentInline]+admin.site.register(Exercise, ExerciseAdmin)admin.site.register(ExerciseCategory)admin.site.register(Language)diff --git a/wger/exercises/management/commands/download-exercise-images.py b/wger/exercises/management/commands/download-exercise-images.pyindex 4ca67d53c..8941727bb 100644--- a/wger/exercises/management/commands/download-exercise-images.py+++ b/wger/exercises/management/commands/download-exercise-images.py@@ -51,7 +51,8 @@ class Command(BaseCommand):action='store',dest='remote_url',default='https://wger.de',- help='Remote URL to fetch the exercises from (default: https://wger.de)')+ help='Remote URL to fetch the exercises from (default: '+ 'https://wger.de)')def handle(self, **options):diff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex ae91e5707..cc72d5d5b 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -21,9 +21,8 @@ import loggingimport bleachfrom django.db import models-from django.db.models import Qfrom django.template.loader import render_to_string-from django.template.defaultfilters import slugify # django.utils.text.slugify in django 1.5!+from django.utils.text import slugifyfrom django.contrib.auth.models import Userfrom django.contrib.sites.models import Sitefrom django.utils.translation import ugettext_lazy as _diff --git a/wger/exercises/urls.py b/wger/exercises/urls.pyindex c564a135a..a804913fd 100644--- a/wger/exercises/urls.py+++ b/wger/exercises/urls.py@@ -151,10 +151,10 @@ patterns_exercise = [urlpatterns = [- url(r'^muscle/', include(patterns_muscle, namespace="muscle")),- url(r'^image/', include(patterns_images, namespace="image")),- url(r'^comment/', include(patterns_comment, namespace="comment")),- url(r'^category/', include(patterns_category, namespace="category")),- url(r'^equipment/', include(patterns_equipment, namespace="equipment")),- url(r'^', include(patterns_exercise, namespace="exercise")),+ url(r'^muscle/', include(patterns_muscle, namespace="muscle")),+ url(r'^image/', include(patterns_images, namespace="image")),+ url(r'^comment/', include(patterns_comment, namespace="comment")),+ url(r'^category/', include(patterns_category, namespace="category")),+ url(r'^equipment/', include(patterns_equipment, namespace="equipment")),+ url(r'^', include(patterns_exercise, namespace="exercise")),]diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex e8a50d662..97c78aad5 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -87,7 +87,7 @@ patterns_workout = [name='ical'),url(r'^(?P<id>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',pdf.workout_log,- name='pdf-log'), #JS!+ name='pdf-log'), # JS!url(r'^(?P<id>\d+)/pdf/log/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',pdf.workout_log,name='pdf-log'),@@ -99,7 +99,7 @@ patterns_workout = [name='pdf-log'),url(r'^(?P<id>\d+)/pdf/table/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',pdf.workout_view,- name='pdf-table'), #JS!+ name='pdf-table'), # JS!url(r'^(?P<id>\d+)/pdf/table/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',pdf.workout_view,name='pdf-table'),@@ -235,13 +235,12 @@ patterns_step = []-urlpatterns = [- url(r'^', include(patterns_workout, namespace="workout")),- url(r'^log/', include(patterns_log, namespace="log")),- url(r'^day/', include(patterns_day, namespace="day")),- url(r'^set/', include(patterns_set, namespace="set")),- url(r'^session/', include(patterns_session, namespace="session")),- url(r'^schedule/', include(patterns_schedule, namespace="schedule")),- url(r'^schedule/step/', include(patterns_step, namespace="step")),+ url(r'^', include(patterns_workout, namespace="workout")),+ url(r'^log/', include(patterns_log, namespace="log")),+ url(r'^day/', include(patterns_day, namespace="day")),+ url(r'^set/', include(patterns_set, namespace="set")),+ url(r'^session/', include(patterns_session, namespace="session")),+ url(r'^schedule/', include(patterns_schedule, namespace="schedule")),+ url(r'^schedule/step/', include(patterns_step, namespace="step")),]diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.pyindex 3da3389e9..484284965 100644--- a/wger/nutrition/urls.py+++ b/wger/nutrition/urls.py@@ -181,12 +181,12 @@ patterns_calories = [urlpatterns = [- url(r'^', include(patterns_plan, namespace="plan")),- url(r'^meal/', include(patterns_meal, namespace="meal")),- url(r'^meal/item/', include(patterns_meal_item, namespace="meal_item")),- url(r'^ingredient/', include(patterns_ingredient, namespace="ingredient")),- url(r'^unit/', include(patterns_weight_unit, namespace="weight_unit")),- url(r'^unit-to-ingredient/', include(patterns_unit_ingredient, namespace="unit_ingredient")),- url(r'^calculator/bmi/', include(patterns_bmi, namespace="bmi")),- url(r'^calculator/calories/', include(patterns_calories, namespace="calories")),+ url(r'^', include(patterns_plan, namespace="plan")),+ url(r'^meal/', include(patterns_meal, namespace="meal")),+ url(r'^meal/item/', include(patterns_meal_item, namespace="meal_item")),+ url(r'^ingredient/', include(patterns_ingredient, namespace="ingredient")),+ url(r'^unit/', include(patterns_weight_unit, namespace="weight_unit")),+ url(r'^unit-to-ingredient/', include(patterns_unit_ingredient, namespace="unit_ingredient")),+ url(r'^calculator/bmi/', include(patterns_bmi, namespace="bmi")),+ url(r'^calculator/calories/', include(patterns_calories, namespace="calories")),]diff --git a/wger/tasks.py b/wger/tasks.pyindex b2a37f7a6..c4df90266 100644--- a/wger/tasks.py+++ b/wger/tasks.py@@ -203,7 +203,7 @@ def create_or_reset_admin(context, settings_path=None):# the settings module during importfrom wger.manager.models import Usertry:- admin = User.objects.get(username="admin")+ User.objects.get(username="admin")print("*** Password for user admin was reset to 'admin'")except User.DoesNotExist:print("*** Created default admin user")@@ -235,7 +235,6 @@ def load_fixtures(context, settings_path=None):# Find the path to the settings and setup the django environmentsetup_django_environment(settings_path)-current_dir = os.path.dirname(os.path.abspath(__file__))# Gymdiff --git a/wger/urls.py b/wger/urls.pyindex 055a0129e..c05c0b940 100644--- a/wger/urls.py+++ b/wger/urls.py@@ -42,11 +42,16 @@ from wger.exercises.api import views as exercises_api_viewsfrom wger.nutrition.api import views as nutrition_api_viewsfrom wger.weight.api import views as weight_api_views++from django.contrib import admin+admin.autodiscover()++## REST API#-### /api/v1 - tastypie - deprecated+# /api/v1 - tastypie - deprecatedv1_api = Api(api_name='v1')v1_api.register(exercises_api.ExerciseCategoryResource())@@ -80,7 +85,7 @@ v1_api.register(core_api.UserProfileResource())v1_api.register(core_api.LicenseResource())-### /api/v2 - django rest framework+# /api/v2 - django rest frameworkrouter = routers.DefaultRouter()# Manager app@@ -122,10 +127,6 @@ router.register(r'mealitem', nutrition_api_views.MealItemViewSet, base_name='mea# Weight approuter.register(r'weightentry', weight_api_views.WeightEntryViewSet, base_name='weightentry')--from django.contrib import admin-admin.autodiscover()-## Sitemaps#