Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Simplify imports

Roland Geidercdb1bfe27a8f
diff --git a/setup.py b/setup.py
index f287b0747..373e4ced8 100644
--- a/setup.py
+++ b/setup.py
@@ -7,8 +7,10 @@
:license: GNU GPL, see LICENSE for more details.
"""
-from setuptools import setup
-from setuptools import find_packages
+from setuptools import (
+ setup,
+ find_packages
+)
from wger import get_version
diff --git a/wger/config/models.py b/wger/config/models.py
index 5c27255cb..91924ca12 100644
--- a/wger/config/models.py
+++ b/wger/config/models.py
@@ -21,8 +21,7 @@ from django.db import models
from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _
from django.core.cache import cache
-from wger.core.models import Language
-from wger.core.models import UserProfile
+from wger.core.models import Language, UserProfile
from wger.gym.helpers import is_any_gym_admin
from wger.gym.models import Gym, GymUserConfig
diff --git a/wger/config/views/gym_config.py b/wger/config/views/gym_config.py
index 6cd32329c..e4a817ffb 100644
--- a/wger/config/views/gym_config.py
+++ b/wger/config/views/gym_config.py
@@ -16,8 +16,7 @@
import logging
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.utils.translation import ugettext as _
from django.views.generic import UpdateView
diff --git a/wger/config/views/language_config.py b/wger/config/views/language_config.py
index 8a9515923..e2798f815 100644
--- a/wger/config/views/language_config.py
+++ b/wger/config/views/language_config.py
@@ -16,8 +16,7 @@
import logging
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.utils.translation import ugettext as _
from django.views.generic import UpdateView
diff --git a/wger/config/views/languages.py b/wger/config/views/languages.py
index 6dbb8a861..d8ca63796 100644
--- a/wger/config/views/languages.py
+++ b/wger/config/views/languages.py
@@ -16,21 +16,24 @@
import logging
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
-from django.views.generic import ListView
-from django.views.generic import CreateView
-from django.views.generic import DetailView
-from django.views.generic import DeleteView
-from django.views.generic import UpdateView
-from wger.core.models import Language
+from django.views.generic import (
+ ListView,
+ CreateView,
+ DetailView,
+ DeleteView,
+ UpdateView
+)
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from wger.core.models import Language
+from wger.utils.generic_views import (
+ WgerDeleteMixin,
+ WgerFormMixin,
+ WgerPermissionMixin
+)
logger = logging.getLogger(__name__)
diff --git a/wger/core/api/resources.py b/wger/core/api/resources.py
index 3def40e84..c5d5141fa 100644
--- a/wger/core/api/resources.py
+++ b/wger/core/api/resources.py
@@ -19,10 +19,12 @@ from tastypie.constants import ALL
from tastypie.resources import ModelResource
from wger.utils.resources import UserObjectsOnlyAuthorization
-from wger.core.models import UserProfile
-from wger.core.models import Language
-from wger.core.models import DaysOfWeek
-from wger.core.models import License
+from wger.core.models import (
+ UserProfile,
+ Language,
+ DaysOfWeek,
+ License
+)
class UserProfileResource(ModelResource):
diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.py
index a50c2ee16..ac0c49fce 100644
--- a/wger/core/api/serializers.py
+++ b/wger/core/api/serializers.py
@@ -17,7 +17,12 @@
from rest_framework import serializers
-from wger.core.models import UserProfile, Language, DaysOfWeek, License
+from wger.core.models import (
+ UserProfile,
+ Language,
+ DaysOfWeek,
+ License
+)
class UserprofileSerializer(serializers.ModelSerializer):
diff --git a/wger/core/api/views.py b/wger/core/api/views.py
index c46709ffc..58d835c18 100644
--- a/wger/core/api/views.py
+++ b/wger/core/api/views.py
@@ -20,15 +20,20 @@ from rest_framework import viewsets
from rest_framework.response import Response
from rest_framework.decorators import detail_route
-from wger.core.models import UserProfile
-from wger.core.models import Language
-from wger.core.models import DaysOfWeek
-from wger.core.models import License
-from wger.core.api.serializers import UsernameSerializer, LanguageSerializer, \
- DaysOfWeekSerializer, LicenseSerializer
+from wger.core.models import (
+ UserProfile,
+ Language,
+ DaysOfWeek,
+ License
+)
+from wger.core.api.serializers import (
+ UsernameSerializer,
+ LanguageSerializer,
+ DaysOfWeekSerializer,
+ LicenseSerializer
+)
from wger.core.api.serializers import UserprofileSerializer
-from wger.utils.permissions import UpdateOnlyPermission
-from wger.utils.permissions import WgerPermission
+from wger.utils.permissions import UpdateOnlyPermission, WgerPermission
class UserProfileViewSet(viewsets.ModelViewSet):
diff --git a/wger/core/demo.py b/wger/core/demo.py
index 138f8a1b9..ad7e04585 100644
--- a/wger/core/demo.py
+++ b/wger/core/demo.py
@@ -26,18 +26,22 @@ from django.utils.translation import ugettext as _
from wger.weight.models import WeightEntry
from wger.exercises.models import Exercise
from wger.core.models import DaysOfWeek
-from wger.manager.models import Workout
-from wger.manager.models import Day
-from wger.manager.models import Set
-from wger.manager.models import Setting
-from wger.manager.models import WorkoutLog
-from wger.manager.models import Schedule
-from wger.manager.models import ScheduleStep
-from wger.nutrition.models import NutritionPlan
-from wger.nutrition.models import Meal
-from wger.nutrition.models import MealItem
-from wger.nutrition.models import Ingredient
-from wger.nutrition.models import IngredientWeightUnit
+from wger.manager.models import (
+ Workout,
+ Day,
+ Set,
+ Setting,
+ WorkoutLog,
+ Schedule,
+ ScheduleStep
+)
+from wger.nutrition.models import (
+ NutritionPlan,
+ Meal,
+ MealItem,
+ Ingredient,
+ IngredientWeightUnit
+)
from wger.utils.language import load_language
diff --git a/wger/core/forms.py b/wger/core/forms.py
index a3535941b..45d430711 100644
--- a/wger/core/forms.py
+++ b/wger/core/forms.py
@@ -19,7 +19,13 @@ from django.contrib.auth.forms import UserCreationForm
from django.contrib.auth.models import User
from django.core.exceptions import ValidationError
from django import forms
-from django.forms import EmailField, Form, CharField, widgets, PasswordInput
+from django.forms import (
+ EmailField,
+ Form,
+ CharField,
+ widgets,
+ PasswordInput
+)
from django.utils.translation import ugettext as _
from wger.core.models import UserProfile
diff --git a/wger/core/management/commands/clear-cache.py b/wger/core/management/commands/clear-cache.py
index 9720ac8f4..debfaab01 100644
--- a/wger/core/management/commands/clear-cache.py
+++ b/wger/core/management/commands/clear-cache.py
@@ -22,8 +22,11 @@ from django.core.management.base import BaseCommand, CommandError
from wger.core.models import Language
from wger.manager.models import Workout, WorkoutLog
from wger.exercises.models import Exercise
-from wger.utils.cache import reset_workout_canonical_form, reset_workout_log
-from wger.utils.cache import delete_template_fragment_cache
+from wger.utils.cache import (
+ reset_workout_canonical_form,
+ reset_workout_log,
+ delete_template_fragment_cache
+)
class Command(BaseCommand):
diff --git a/wger/core/management/commands/extract-i18n.py b/wger/core/management/commands/extract-i18n.py
index f4fbd90eb..a7561f2fd 100644
--- a/wger/core/management/commands/extract-i18n.py
+++ b/wger/core/management/commands/extract-i18n.py
@@ -16,8 +16,11 @@
from django.core.management.base import BaseCommand
-from wger.exercises.models import ExerciseCategory, Muscle
-from wger.exercises.models import Equipment
+from wger.exercises.models import (
+ ExerciseCategory,
+ Muscle,
+ Equipment
+)
class Command(BaseCommand):
diff --git a/wger/core/templates/403.html b/wger/core/templates/403.html
index 23143cce4..93ba25f27 100644
--- a/wger/core/templates/403.html
+++ b/wger/core/templates/403.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load staticfiles %}
+{% load i18n staticfiles %}
{% block title %}{% trans "Forbidden!" %}{% endblock %}
diff --git a/wger/core/templates/404.html b/wger/core/templates/404.html
index 607912cd7..0d826b2ab 100644
--- a/wger/core/templates/404.html
+++ b/wger/core/templates/404.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load staticfiles %}
+{% load i18n staticfiles %}
{% block title %}{% trans "Page not found" %}{% endblock %}
diff --git a/wger/core/templates/500.html b/wger/core/templates/500.html
index b33d74d60..4c4d6caec 100644
--- a/wger/core/templates/500.html
+++ b/wger/core/templates/500.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load staticfiles %}
+{% load i18n staticfiles %}
{% block title %}{% trans "An error occured" %}{% endblock %}
diff --git a/wger/core/templates/delete.html b/wger/core/templates/delete.html
index 91f5a0a8b..66eaaed5c 100644
--- a/wger/core/templates/delete.html
+++ b/wger/core/templates/delete.html
@@ -1,7 +1,5 @@
{% extends extend_template %}
-{% load i18n %}
-{% load staticfiles %}
-{% load wger_extras %}
+{% load i18n staticfiles wger_extras %}
<!--
Title
diff --git a/wger/core/templates/form.html b/wger/core/templates/form.html
index 1ef215080..5d9f241d9 100644
--- a/wger/core/templates/form.html
+++ b/wger/core/templates/form.html
@@ -1,7 +1,5 @@
{% extends extend_template %}
-{% load i18n %}
-{% load staticfiles %}
-{% load wger_extras %}
+{% load i18n staticfiles wger_extras %}
{% block header %}
diff --git a/wger/core/templates/index.html b/wger/core/templates/index.html
index 1c9bbe453..dbcefaef4 100644
--- a/wger/core/templates/index.html
+++ b/wger/core/templates/index.html
@@ -1,7 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load staticfiles %}
-{% load wger_extras %}
+{% load i18n staticfiles wger_extras %}
{% block title %}{% trans "Dashboard" %}{% endblock %}
diff --git a/wger/core/templates/license/list.html b/wger/core/templates/license/list.html
index d1d22bfa8..dd3466e06 100644
--- a/wger/core/templates/license/list.html
+++ b/wger/core/templates/license/list.html
@@ -1,7 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load staticfiles %}
-{% load wger_extras %}
+{% load i18n staticfiles wger_extras %}
{% block title %}{% trans "License list" %}{% endblock %}
diff --git a/wger/core/templates/misc/about.html b/wger/core/templates/misc/about.html
index 107116941..e72c08107 100644
--- a/wger/core/templates/misc/about.html
+++ b/wger/core/templates/misc/about.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load staticfiles %}
+{% load i18n staticfiles %}
{% block title %}{% trans "About us" %}{% endblock %}
diff --git a/wger/core/templates/misc/contact.html b/wger/core/templates/misc/contact.html
index 7995bd57c..25b42588b 100644
--- a/wger/core/templates/misc/contact.html
+++ b/wger/core/templates/misc/contact.html
@@ -1,6 +1,5 @@
{% extends "base_wide.html" %}
-{% load i18n %}
-{% load wger_extras %}
+{% load i18n wger_extras %}
{% block title%}{% trans "Get in touch" %}{% endblock %}
diff --git a/wger/core/templates/mobile/index.html b/wger/core/templates/mobile/index.html
index 9467d7497..72c17efde 100644
--- a/wger/core/templates/mobile/index.html
+++ b/wger/core/templates/mobile/index.html
@@ -1,7 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load staticfiles %}
-{% load wger_extras %}
+{% load i18n staticfiles wger_extras %}
{% block title %}{% trans "Dashboard" %}{% endblock %}
diff --git a/wger/core/templates/mobile/misc/contact.html b/wger/core/templates/mobile/misc/contact.html
index d6a3996dd..d5e4f3f63 100644
--- a/wger/core/templates/mobile/misc/contact.html
+++ b/wger/core/templates/mobile/misc/contact.html
@@ -1,6 +1,5 @@
{% extends "base_wide.html" %}
-{% load i18n %}
-{% load wger_extras %}
+{% load i18n wger_extras %}
{% block title%}{% trans "Get in touch" %}{% endblock %}
diff --git a/wger/core/templates/rest_framework/api.html b/wger/core/templates/rest_framework/api.html
index 94da95fe6..3ef3eaebc 100644
--- a/wger/core/templates/rest_framework/api.html
+++ b/wger/core/templates/rest_framework/api.html
@@ -1,8 +1,5 @@
{% extends "base.html" %}
-{% load rest_framework %}
-{% load wger_extras %}
-{% load django_bootstrap_breadcrumbs %}
-{% load static %}
+{% load rest_framework wger_extras django_bootstrap_breadcrumbs load static %}
{% block header %}
<link rel="stylesheet" type="text/css" href="{% static 'rest_framework/css/prettify.css' %}"/>
diff --git a/wger/core/templates/tags/language_select.html b/wger/core/templates/tags/language_select.html
index f743bd5e9..baf239a4c 100644
--- a/wger/core/templates/tags/language_select.html
+++ b/wger/core/templates/tags/language_select.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load staticfiles %}
+{% load i18n staticfiles %}
<li>
<a href="{{i18n_path}}">
diff --git a/wger/core/templates/tags/license-sidebar.html b/wger/core/templates/tags/license-sidebar.html
index fb3cc55c6..b8f76e0ce 100644
--- a/wger/core/templates/tags/license-sidebar.html
+++ b/wger/core/templates/tags/license-sidebar.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load staticfiles %}
+{% load i18n staticfiles %}
<h4>{% trans "Free license" %}</h4>
<p>
diff --git a/wger/core/templates/tags/render_day.html b/wger/core/templates/tags/render_day.html
index a8d5e4b12..e4b5760e1 100644
--- a/wger/core/templates/tags/render_day.html
+++ b/wger/core/templates/tags/render_day.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load staticfiles wger_extras thumbnail %}
+{% load i18n staticfiles wger_extras thumbnail %}
<script>
$(document).ready(function() {
diff --git a/wger/core/templates/tags/render_form_element.html b/wger/core/templates/tags/render_form_element.html
index 1ed80a375..6b1e458fb 100644
--- a/wger/core/templates/tags/render_form_element.html
+++ b/wger/core/templates/tags/render_form_element.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% load wger_extras %}
+{% load i18n wger_extras %}
{% if not field.is_hidden %}
<div class="form-group {% if field.errors %}has-error{% endif %}" id="form-{{field.name}}">
<div {% if field.errors %}class="has-error has-feedback"{% endif %}>
diff --git a/wger/core/templates/tags/render_weight_log.html b/wger/core/templates/tags/render_weight_log.html
index d34a92e2a..4e8aea309 100644
--- a/wger/core/templates/tags/render_weight_log.html
+++ b/wger/core/templates/tags/render_weight_log.html
@@ -1,6 +1,4 @@
-{% load i18n %}
-{% load staticfiles %}
-{% load wger_extras %}
+{% load i18n staticfiles wger_extras %}
<div class="weight-chart-table-toggle" data-toggle-target="table-{{div_uuid}}">
<p>
<a href="#">
diff --git a/wger/core/templates/user/api_key.html b/wger/core/templates/user/api_key.html
index 8e29d97dc..c6b372e9d 100644
--- a/wger/core/templates/user/api_key.html
+++ b/wger/core/templates/user/api_key.html
@@ -1,7 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load staticfiles %}
-{% load wger_extras %}
+{% load i18n staticfiles wger_extras %}
{% block title %}{% trans "API key" %}{% endblock %}
diff --git a/wger/core/templates/user/change_password.html b/wger/core/templates/user/change_password.html
index e1cf7a3fb..c6bd36a22 100644
--- a/wger/core/templates/user/change_password.html
+++ b/wger/core/templates/user/change_password.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load wger_extras %}
+{% load i18n wger_extras %}
{% block title %}{% trans "Change password" %}{% endblock %}
diff --git a/wger/core/templates/user/delete_account.html b/wger/core/templates/user/delete_account.html
index 80313ee7a..24c3f1ffb 100644
--- a/wger/core/templates/user/delete_account.html
+++ b/wger/core/templates/user/delete_account.html
@@ -1,8 +1,5 @@
{% extends "base.html" %}
-{% load browserid %}
-{% load i18n %}
-{% load staticfiles %}
-{% load wger_extras %}
+{% load browserid i18n staticfiles wger_extras %}
{% block title %}{% trans "Delete account" %}{% endblock %}
diff --git a/wger/core/templates/user/login.html b/wger/core/templates/user/login.html
index b62c2230a..6e7e90100 100644
--- a/wger/core/templates/user/login.html
+++ b/wger/core/templates/user/login.html
@@ -1,8 +1,5 @@
{% extends "base.html" %}
-{% load browserid %}
-{% load i18n %}
-{% load staticfiles %}
-{% load wger_extras %}
+{% load browserid i18n staticfiles wger_extras %}
{% block title %}{% trans "Login" %}{% endblock %}
diff --git a/wger/core/templates/user/password_reset_confirm.html b/wger/core/templates/user/password_reset_confirm.html
index 569d171e8..0faf7cefb 100644
--- a/wger/core/templates/user/password_reset_confirm.html
+++ b/wger/core/templates/user/password_reset_confirm.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load wger_extras %}
+{% load i18n wger_extras %}
{% block title %}{% trans "Password reset confirmation" %}{% endblock %}
diff --git a/wger/core/templates/user/password_reset_form.html b/wger/core/templates/user/password_reset_form.html
index e2e21fdba..34dfb7739 100644
--- a/wger/core/templates/user/password_reset_form.html
+++ b/wger/core/templates/user/password_reset_form.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load wger_extras %}
+{% load i18n wger_extras %}
{% block title %}{% trans "Password reset" %}{% endblock %}
diff --git a/wger/core/templates/user/preferences.html b/wger/core/templates/user/preferences.html
index eeec24dff..25d18e43d 100644
--- a/wger/core/templates/user/preferences.html
+++ b/wger/core/templates/user/preferences.html
@@ -1,7 +1,5 @@
{% extends "base.html" %}
-{% load i18n %}
-{% load staticfiles %}
-{% load wger_extras %}
+{% load i18n staticfiles wger_extras %}
{% block title %}{% trans "Preferences" %}{% endblock %}
diff --git a/wger/core/templatetags/wger_extras.py b/wger/core/templatetags/wger_extras.py
index 0fa3b1c2c..b2c6128c6 100644
--- a/wger/core/templatetags/wger_extras.py
+++ b/wger/core/templatetags/wger_extras.py
@@ -20,8 +20,7 @@ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import pgettext
from django.conf import settings
-from wger.utils.constants import PAGINATION_MAX_TOTAL_PAGES
-from wger.utils.constants import PAGINATION_PAGES_AROUND_CURRENT
+from wger.utils.constants import PAGINATION_MAX_TOTAL_PAGES, PAGINATION_PAGES_AROUND_CURRENT
register = template.Library()
diff --git a/wger/core/urls.py b/wger/core/urls.py
index 1e4e0f0ee..0f9011acc 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -15,14 +15,20 @@
# You should have received a copy of the GNU Affero General Public License
-from django.conf.urls import patterns, url, include
+from django.conf.urls import (
+ patterns,
+ url,
+ include
+)
from django.views.generic import TemplateView
from django.contrib.auth import views
from django.core.urlresolvers import reverse_lazy
-from wger.core.views import user
-from wger.core.views import misc
-from wger.core.views import license
+from wger.core.views import (
+ user,
+ misc,
+ license
+)
# sub patterns for languages
patterns_user = patterns('',
diff --git a/wger/core/views/license.py b/wger/core/views/license.py
index fc9e4c5bb..80194b77b 100644
--- a/wger/core/views/license.py
+++ b/wger/core/views/license.py
@@ -16,18 +16,21 @@
import logging
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
-from django.views.generic import ListView
-from django.views.generic import DeleteView
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
-
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from django.views.generic import (
+ ListView,
+ DeleteView,
+ CreateView,
+ UpdateView
+)
+
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
from wger.core.models import License
diff --git a/wger/core/views/misc.py b/wger/core/views/misc.py
index 14c1459d4..8d413f362 100644
--- a/wger/core/views/misc.py
+++ b/wger/core/views/misc.py
@@ -19,8 +19,7 @@ import logging
from django.shortcuts import render
from django.http import HttpResponseRedirect
from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.core import mail
from django.utils.translation import ugettext as _
from django.views.generic.edit import FormView
@@ -31,10 +30,8 @@ from django.contrib.auth import login as django_login
from django.template.loader import render_to_string
-from wger.core.forms import FeedbackRegisteredForm
-from wger.core.forms import FeedbackAnonymousForm
-from wger.core.demo import create_demo_entries
-from wger.core.demo import create_temporary_user
+from wger.core.forms import FeedbackRegisteredForm, FeedbackAnonymousForm
+from wger.core.demo import create_demo_entries, create_temporary_user
from wger.core.models import DaysOfWeek
from wger.manager.models import Schedule
from wger.nutrition.models import NutritionPlan
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 26355fdd7..d4df4faac 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -17,8 +17,7 @@
import logging
from django.shortcuts import render, get_object_or_404
-from django.http import HttpResponseRedirect
-from django.http import HttpResponseForbidden
+from django.http import HttpResponseRedirect, HttpResponseForbidden
from django.core.context_processors import csrf
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _, ugettext_lazy
@@ -30,23 +29,30 @@ from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User as Django_User, User
from django.contrib.auth.views import login as django_loginview
from django.contrib import messages
-from django.views.generic import RedirectView, UpdateView, DetailView
+from django.views.generic import (
+ RedirectView,
+ UpdateView,
+ DetailView
+)
from django.conf import settings
from rest_framework.authtoken.models import Token
from wger.utils.constants import USER_TAB
-from wger.utils.generic_views import WgerPermissionMixin
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.user_agents import check_request_amazon
-from wger.utils.user_agents import check_request_android
-from wger.core.forms import UserPreferencesForm, UserPersonalInformationForm
-from wger.core.forms import PasswordConfirmationForm
-from wger.core.forms import RegistrationForm
-from wger.core.forms import RegistrationFormNoCaptcha
+from wger.utils.generic_views import WgerPermissionMixin, WgerFormMixin
+from wger.utils.user_agents import check_request_amazon, check_request_android
+from wger.core.forms import (
+ UserPreferencesForm,
+ UserPersonalInformationForm,
+ PasswordConfirmationForm,
+ RegistrationForm,
+ RegistrationFormNoCaptcha
+)
from wger.core.models import Language
-from wger.manager.models import WorkoutLog
-from wger.manager.models import WorkoutSession
-from wger.manager.models import Workout
+from wger.manager.models import (
+ WorkoutLog,
+ WorkoutSession,
+ Workout
+)
from wger.nutrition.models import NutritionPlan
from wger.config.models import GymConfig
from wger.weight.models import WeightEntry
diff --git a/wger/exercises/api/resources.py b/wger/exercises/api/resources.py
index 27902b45c..c8f3efac9 100644
--- a/wger/exercises/api/resources.py
+++ b/wger/exercises/api/resources.py
@@ -20,15 +20,16 @@ from tastypie.constants import ALL, ALL_WITH_RELATIONS
from easy_thumbnails.alias import aliases
from easy_thumbnails.files import get_thumbnailer
-from wger.core.api.resources import LanguageResource
-from wger.core.api.resources import LicenseResource
-
-from wger.exercises.models import Exercise
-from wger.exercises.models import ExerciseCategory
-from wger.exercises.models import ExerciseComment
-from wger.exercises.models import ExerciseImage
-from wger.exercises.models import Muscle
-from wger.exercises.models import Equipment
+from wger.core.api.resources import LanguageResource, LicenseResource
+
+from wger.exercises.models import (
+ Exercise,
+ ExerciseCategory,
+ ExerciseComment,
+ ExerciseImage,
+ Muscle,
+ Equipment
+)
class ExerciseResource(ModelResource):
diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.py
index 38b542ca5..78a10123d 100644
--- a/wger/exercises/api/serializers.py
+++ b/wger/exercises/api/serializers.py
@@ -15,8 +15,14 @@
# You should have received a copy of the GNU Affero General Public License
from rest_framework import serializers
-from wger.exercises.models import Muscle, Exercise, ExerciseImage, \
- ExerciseCategory, Equipment, ExerciseComment
+from wger.exercises.models import (
+ Muscle,
+ Exercise,
+ ExerciseImage,
+ ExerciseCategory,
+ Equipment,
+ ExerciseComment
+)
class ExerciseSerializer(serializers.ModelSerializer):
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 0f022cffd..8e8982234 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -18,8 +18,7 @@
from rest_framework import viewsets
from rest_framework.permissions import IsAuthenticatedOrReadOnly
from rest_framework.response import Response
-from rest_framework.decorators import detail_route
-from rest_framework.decorators import api_view
+from rest_framework.decorators import detail_route, api_view
from easy_thumbnails.alias import aliases
from easy_thumbnails.files import get_thumbnailer
@@ -27,17 +26,23 @@ from easy_thumbnails.files import get_thumbnailer
from django.utils.translation import ugettext as _
from wger.config.models import LanguageConfig
-from wger.exercises.api.serializers import MuscleSerializer, ExerciseSerializer, \
- ExerciseImageSerializer, ExerciseCategorySerializer, EquipmentSerializer, \
+from wger.exercises.api.serializers import (
+ MuscleSerializer,
+ ExerciseSerializer,
+ ExerciseImageSerializer,
+ ExerciseCategorySerializer,
+ EquipmentSerializer,
ExerciseCommentSerializer
-from wger.exercises.models import Exercise
-from wger.exercises.models import Equipment
-from wger.exercises.models import ExerciseCategory
-from wger.exercises.models import ExerciseImage
-from wger.exercises.models import ExerciseComment
-from wger.exercises.models import Muscle
-from wger.utils.language import load_item_languages
-from wger.utils.language import load_language
+)
+from wger.exercises.models import (
+ Exercise,
+ Equipment,
+ ExerciseCategory,
+ ExerciseImage,
+ ExerciseComment,
+ Muscle
+)
+from wger.utils.language import load_item_languages, load_language
from wger.utils.permissions import CreateOnlyPermission
diff --git a/wger/exercises/forms.py b/wger/exercises/forms.py
index 96b0c8da3..1c883941d 100644
--- a/wger/exercises/forms.py
+++ b/wger/exercises/forms.py
@@ -16,8 +16,7 @@
from django import forms
-from wger.exercises.models import ExerciseImage
-from wger.exercises.models import ExerciseComment
+from wger.exercises.models import ExerciseImage, ExerciseComment
class ExerciseImageForm(forms.ModelForm):
diff --git a/wger/exercises/management/commands/download-exercise-images.py b/wger/exercises/management/commands/download-exercise-images.py
index 7bf5ec608..14857a33b 100644
--- a/wger/exercises/management/commands/download-exercise-images.py
+++ b/wger/exercises/management/commands/download-exercise-images.py
@@ -20,15 +20,13 @@ import os
from optparse import make_option
from django.core.exceptions import ImproperlyConfigured
-from django.core.management.base import BaseCommand
-from django.core.management.base import CommandError
+from django.core.management.base import BaseCommand, CommandError
from django.core.files import File
from django.core.validators import URLValidator
from django.core.exceptions import ValidationError
from django.conf import settings
-from wger.exercises.models import Exercise
-from wger.exercises.models import ExerciseImage
+from wger.exercises.models import Exercise, ExerciseImage
class Command(BaseCommand):
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 9f2c31e63..187a89716 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -34,12 +34,13 @@ from django.core.validators import MinLengthValidator
from wger.core.models import Language
from wger.utils.managers import SubmissionManager
-from wger.utils.models import AbstractLicenseModel
-from wger.utils.models import AbstractSubmissionModel
+from wger.utils.models import AbstractLicenseModel, AbstractSubmissionModel
from wger.utils.constants import EMAIL_FROM
-from wger.utils.cache import delete_template_fragment_cache
-from wger.utils.cache import reset_workout_canonical_form
-from wger.utils.cache import cache_mapper
+from wger.utils.cache import (
+ delete_template_fragment_cache,
+ reset_workout_canonical_form,
+ cache_mapper
+)
logger = logging.getLogger(__name__)
diff --git a/wger/exercises/tests/test_categories.py b/wger/exercises/tests/test_categories.py
index 91d19b31c..dcb26ee15 100644
--- a/wger/exercises/tests/test_categories.py
+++ b/wger/exercises/tests/test_categories.py
@@ -19,10 +19,12 @@ from wger.core.tests import api_base_test
from wger.exercises.models import ExerciseCategory
from wger.utils.cache import get_template_cache_name
-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
-from wger.manager.tests.testcase import WorkoutManagerTestCase
-from wger.manager.tests.testcase import WorkoutManagerEditTestCase
-from wger.manager.tests.testcase import WorkoutManagerAddTestCase
+from wger.manager.tests.testcase import (
+ WorkoutManagerDeleteTestCase,
+ WorkoutManagerTestCase,
+ WorkoutManagerEditTestCase,
+ WorkoutManagerAddTestCase,
+)
class ExerciseCategoryRepresentationTestCase(WorkoutManagerTestCase):
diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.py
index c610ac25e..c3ed3ef89 100644
--- a/wger/exercises/tests/test_equipment.py
+++ b/wger/exercises/tests/test_equipment.py
@@ -17,15 +17,15 @@ from django.core.urlresolvers import reverse
from django.core.cache import cache
from wger.core.tests import api_base_test
-from wger.exercises.models import Equipment
-from wger.exercises.models import Exercise
-
-from wger.manager.tests.testcase import WorkoutManagerTestCase
-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
-from wger.manager.tests.testcase import WorkoutManagerEditTestCase
-from wger.manager.tests.testcase import WorkoutManagerAddTestCase
+from wger.exercises.models import Equipment, Exercise
+
+from wger.manager.tests.testcase import (
+ WorkoutManagerTestCase,
+ WorkoutManagerDeleteTestCase,
+ WorkoutManagerEditTestCase,
+ WorkoutManagerAddTestCase
+)
from wger.utils.cache import get_template_cache_name, cache_mapper
-
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index 896f0f9ed..04668a6ea 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -19,14 +19,17 @@ from django.core.urlresolvers import reverse
from django.core.cache import cache
from wger.core.tests import api_base_test
-from wger.exercises.models import Exercise
-from wger.exercises.models import Muscle
-from wger.exercises.models import ExerciseCategory
-from wger.manager.tests.testcase import STATUS_CODES_FAIL
-from wger.manager.tests.testcase import WorkoutManagerTestCase
-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
-from wger.utils.cache import get_template_cache_name
-from wger.utils.cache import cache_mapper
+from wger.exercises.models import (
+ Exercise,
+ Muscle,
+ ExerciseCategory,
+)
+from wger.manager.tests.testcase import (
+ STATUS_CODES_FAIL,
+ WorkoutManagerTestCase,
+ WorkoutManagerDeleteTestCase
+)
+from wger.utils.cache import get_template_cache_name, cache_mapper
class ExerciseRepresentationTestCase(WorkoutManagerTestCase):
diff --git a/wger/exercises/tests/test_exercise_comments.py b/wger/exercises/tests/test_exercise_comments.py
index 4e7499842..cd3bb4fe2 100644
--- a/wger/exercises/tests/test_exercise_comments.py
+++ b/wger/exercises/tests/test_exercise_comments.py
@@ -17,12 +17,13 @@ from django.core.urlresolvers import reverse
from django.core.cache import cache
from wger.core.tests import api_base_test
-from wger.exercises.models import Exercise
-from wger.exercises.models import ExerciseComment
+from wger.exercises.models import Exercise, ExerciseComment
-from wger.manager.tests.testcase import WorkoutManagerTestCase
-from wger.manager.tests.testcase import WorkoutManagerEditTestCase
-from wger.manager.tests.testcase import WorkoutManagerAddTestCase
+from wger.manager.tests.testcase import (
+ WorkoutManagerTestCase,
+ WorkoutManagerEditTestCase,
+ WorkoutManagerAddTestCase
+)
from wger.utils.cache import cache_mapper
diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.py
index 7f8c659b3..b5c84b97d 100644
--- a/wger/exercises/tests/test_exercise_images.py
+++ b/wger/exercises/tests/test_exercise_images.py
@@ -18,13 +18,14 @@ from django.core.urlresolvers import reverse
from django.core.files import File
from wger.core.tests import api_base_test
-from wger.exercises.models import Exercise
-from wger.exercises.models import ExerciseImage
-
-from wger.manager.tests.testcase import WorkoutManagerTestCase
-from wger.manager.tests.testcase import WorkoutManagerEditTestCase
-from wger.manager.tests.testcase import WorkoutManagerAddTestCase
-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
+from wger.exercises.models import Exercise, ExerciseImage
+
+from wger.manager.tests.testcase import (
+ WorkoutManagerTestCase,
+ WorkoutManagerEditTestCase,
+ WorkoutManagerAddTestCase,
+ WorkoutManagerDeleteTestCase
+)
class MainImageTestCase(WorkoutManagerTestCase):
diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.py
index 09750a2d5..38656f607 100644
--- a/wger/exercises/tests/test_muscles.py
+++ b/wger/exercises/tests/test_muscles.py
@@ -19,10 +19,12 @@ from wger.core.tests import api_base_test
from wger.exercises.models import Muscle
-from wger.manager.tests.testcase import WorkoutManagerTestCase
-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
-from wger.manager.tests.testcase import WorkoutManagerEditTestCase
-from wger.manager.tests.testcase import WorkoutManagerAddTestCase
+from wger.manager.tests.testcase import (
+ WorkoutManagerTestCase,
+ WorkoutManagerDeleteTestCase,
+ WorkoutManagerEditTestCase,
+ WorkoutManagerAddTestCase,
+)
from wger.utils.cache import get_template_cache_name
diff --git a/wger/exercises/tests/test_submitted_exercise.py b/wger/exercises/tests/test_submitted_exercise.py
index 15d1d4932..febd9cd0b 100644
--- a/wger/exercises/tests/test_submitted_exercise.py
+++ b/wger/exercises/tests/test_submitted_exercise.py
@@ -17,8 +17,7 @@ from django.core.urlresolvers import reverse
from wger.exercises.models import Exercise
-from wger.manager.tests.testcase import STATUS_CODES_FAIL
-from wger.manager.tests.testcase import WorkoutManagerTestCase
+from wger.manager.tests.testcase import STATUS_CODES_FAIL, WorkoutManagerTestCase
class ExercisesPendingTestCase(WorkoutManagerTestCase):
diff --git a/wger/exercises/urls.py b/wger/exercises/urls.py
index 2024e4001..ac9d73382 100644
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@ -18,12 +18,14 @@
from django.conf.urls import patterns, url, include
from django.contrib.auth.decorators import login_required
-from wger.exercises.views import exercises
-from wger.exercises.views import comments
-from wger.exercises.views import categories
-from wger.exercises.views import muscles
-from wger.exercises.views import images
-from wger.exercises.views import equipment
+from wger.exercises.views import (
+ exercises,
+ comments,
+ categories,
+ muscles,
+ images,
+ equipment
+)
diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.py
index c60057314..8b67bd82f 100644
--- a/wger/exercises/views/categories.py
+++ b/wger/exercises/views/categories.py
@@ -15,20 +15,23 @@
# You should have received a copy of the GNU Affero General Public License
import logging
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
-from django.views.generic import DeleteView
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
+from django.views.generic import (
+ DeleteView,
+ CreateView,
+ UpdateView
+)
from wger.exercises.models import ExerciseCategory
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
from wger.utils.language import load_language
diff --git a/wger/exercises/views/comments.py b/wger/exercises/views/comments.py
index efab09b21..a39ad7200 100644
--- a/wger/exercises/views/comments.py
+++ b/wger/exercises/views/comments.py
@@ -21,15 +21,11 @@ from django.core.urlresolvers import reverse
from django.contrib.auth.decorators import permission_required
from django.utils.translation import ugettext_lazy
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
+from django.views.generic import CreateView, UpdateView
from wger.exercises.forms import CommentForm
-from wger.exercises.models import Exercise
-from wger.exercises.models import ExerciseComment
-
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from wger.exercises.models import Exercise, ExerciseComment
+from wger.utils.generic_views import WgerFormMixin, WgerPermissionMixin
logger = logging.getLogger(__name__)
diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.py
index 7e87f8937..f9c562aba 100644
--- a/wger/exercises/views/equipment.py
+++ b/wger/exercises/views/equipment.py
@@ -15,22 +15,23 @@
# You should have received a copy of the GNU Affero General Public License
import logging
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.utils.translation import ugettext_lazy
from django.utils.translation import ugettext as _
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
-from django.views.generic import DeleteView
-from django.views.generic import ListView
+from django.views.generic import (
+ CreateView,
+ UpdateView,
+ DeleteView,
+ ListView
+)
from wger.config.models import LanguageConfig
-
from wger.exercises.models import Equipment
-
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
from wger.utils.language import load_item_languages
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index ceb13e585..d8c6f9e10 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -13,43 +13,47 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
+import six
import logging
import uuid
from django.core import mail
-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.forms import ModelForm
-from django.forms import ModelChoiceField
-from django.forms import ModelMultipleChoiceField
+from django.shortcuts import render, get_object_or_404
+from django.http import HttpResponseRedirect, HttpResponseForbidden
+from django.forms import (
+ ModelForm,
+ ModelChoiceField,
+ ModelMultipleChoiceField
+)
from django.core.cache import cache
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.contrib.auth.decorators import permission_required
from django.contrib import messages
from django.template.loader import render_to_string
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
-from django.views.generic import ListView
-from django.views.generic import DeleteView
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
-import six
+from django.views.generic import (
+ ListView,
+ DeleteView,
+ CreateView,
+ UpdateView
+)
from wger.manager.models import WorkoutLog
-from wger.exercises.models import Exercise, Muscle
-from wger.exercises.models import ExerciseCategory
+from wger.exercises.models import (
+ Exercise,
+ Muscle,
+ ExerciseCategory
+)
from wger.exercises.widgets import MuscleTranslatedSelectMultiple
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
-from wger.utils.language import load_language
-from wger.utils.language import load_item_languages
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
+from wger.utils.language import load_language, load_item_languages
from wger.utils.cache import cache_mapper
-from wger.utils.widgets import TranslatedSelect
-from wger.utils.widgets import TranslatedSelectMultiple
+from wger.utils.widgets import TranslatedSelect, TranslatedSelectMultiple
from wger.config.models import LanguageConfig
from wger.weight.helpers import process_log_entries
diff --git a/wger/exercises/views/images.py b/wger/exercises/views/images.py
index 90dc9fe9c..8fb38222d 100644
--- a/wger/exercises/views/images.py
+++ b/wger/exercises/views/images.py
@@ -21,18 +21,19 @@ from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext_lazy
from django.utils.translation import ugettext as _
+from django.views.generic import (
+ CreateView,
+ UpdateView,
+ DeleteView
+)
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
-from django.views.generic import DeleteView
-
-from wger.exercises.models import Exercise
-from wger.exercises.models import ExerciseImage
+from wger.exercises.models import Exercise, ExerciseImage
from wger.exercises.forms import ExerciseImageForm
-
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
logger = logging.getLogger(__name__)
diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.py
index bcf108c8d..3a377a530 100644
--- a/wger/exercises/views/muscles.py
+++ b/wger/exercises/views/muscles.py
@@ -15,21 +15,23 @@
# You should have received a copy of the GNU Affero General Public License
import logging
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
-from django.views.generic import ListView
-from django.views.generic import DeleteView
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
+from django.views.generic import (
+ ListView,
+ DeleteView,
+ CreateView,
+ UpdateView
+)
from wger.exercises.models import Muscle
-
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
from wger.utils.language import load_item_languages
from wger.config.models import LanguageConfig
diff --git a/wger/gym/helpers.py b/wger/gym/helpers.py
index 63ed090ba..d6183090e 100644
--- a/wger/gym/helpers.py
+++ b/wger/gym/helpers.py
@@ -14,8 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-from wger.manager.models import WorkoutLog
-from wger.manager.models import WorkoutSession
+from wger.manager.models import WorkoutLog, WorkoutSession
def get_user_last_activity(user):
diff --git a/wger/gym/signals.py b/wger/gym/signals.py
index 2cf6e2709..c279569a3 100644
--- a/wger/gym/signals.py
+++ b/wger/gym/signals.py
@@ -15,14 +15,14 @@
# You should have received a copy of the GNU Affero General Public License
-from django.conf import settings
-from django.db.models.signals import post_save
-from django.db.models.signals import post_delete
+from django.db.models.signals import post_save, post_delete
from django.dispatch import receiver
-from wger.gym.models import Gym
-from wger.gym.models import GymConfig
-from wger.gym.models import UserDocument
+from wger.gym.models import (
+ Gym,
+ GymConfig,
+ UserDocument
+)
@receiver(post_save, sender=Gym)
diff --git a/wger/gym/urls.py b/wger/gym/urls.py
index 3755fe836..573267e97 100644
--- a/wger/gym/urls.py
+++ b/wger/gym/urls.py
@@ -15,14 +15,20 @@
# You should have received a copy of the GNU Affero General Public License
-from django.conf.urls import patterns, url, include
+from django.conf.urls import (
+ patterns,
+ url,
+ include
+)
-from wger.gym.views import gym
-from wger.gym.views import config
-from wger.gym.views import admin_config
-from wger.gym.views import user_config
-from wger.gym.views import admin_notes
-from wger.gym.views import document
+from wger.gym.views import (
+ gym,
+ config,
+ admin_config,
+ user_config,
+ admin_notes,
+ document
+)
# 'sub patterns' for gyms
diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.py
index 3aa201bab..0a47a10a0 100644
--- a/wger/gym/views/admin_notes.py
+++ b/wger/gym/views/admin_notes.py
@@ -20,15 +20,19 @@ from django.contrib.auth.models import User
from django.http.response import HttpResponseForbidden
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
-from django.views.generic import ListView
-from django.views.generic import DeleteView
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
+from django.views.generic import (
+ ListView,
+ DeleteView,
+ CreateView,
+ UpdateView
+)
from wger.gym.models import AdminUserNote
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
logger = logging.getLogger(__name__)
diff --git a/wger/gym/views/document.py b/wger/gym/views/document.py
index fe94643eb..e3a6f2e20 100644
--- a/wger/gym/views/document.py
+++ b/wger/gym/views/document.py
@@ -20,14 +20,18 @@ from django.contrib.auth.models import User
from django.http.response import HttpResponseForbidden
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
-from django.views.generic import ListView
-from django.views.generic import DeleteView
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
-
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from django.views.generic import (
+ ListView,
+ DeleteView,
+ CreateView,
+ UpdateView
+)
+
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
from wger.gym.models import UserDocument
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 2f01b3f9a..95a198d20 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -18,29 +18,36 @@ import datetime
import logging
from django.contrib.auth.decorators import login_required
-from django.contrib.auth.models import Group
-from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
-from django.http.response import HttpResponseForbidden, HttpResponse, HttpResponseRedirect
+from django.contrib.auth.models import Group, User
+from django.core.urlresolvers import reverse, reverse_lazy
+from django.http.response import (
+ HttpResponseForbidden,
+ HttpResponse,
+ HttpResponseRedirect
+)
from django.shortcuts import render, get_object_or_404
from django.utils.translation import ugettext as _
from django.utils.translation import ugettext_lazy
-from django.views.generic import ListView
-from django.views.generic import DeleteView
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
+from django.views.generic import (
+ ListView,
+ DeleteView,
+ CreateView,
+ UpdateView
+)
from wger.gym.forms import GymUserAddForm, GymUserPermisssionForm
from wger.gym.helpers import get_user_last_activity, is_any_gym_admin
-from wger.gym.models import Gym
-from wger.gym.models import GymAdminConfig
-from wger.gym.models import GymUserConfig
+from wger.gym.models import (
+ Gym,
+ GymAdminConfig,
+ GymUserConfig
+)
from wger.config.models import GymConfig as GlobalGymConfig
-
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
from wger.utils.helpers import password_generator
diff --git a/wger/manager/api/resources.py b/wger/manager/api/resources.py
index 94ea5263a..d7df00a07 100644
--- a/wger/manager/api/resources.py
+++ b/wger/manager/api/resources.py
@@ -15,23 +15,27 @@
# You should have received a copy of the GNU Affero General Public License
from tastypie import fields
-from tastypie.authentication import ApiKeyAuthentication
-from tastypie.authentication import MultiAuthentication
-from tastypie.authentication import SessionAuthentication
+from tastypie.authentication import (
+ ApiKeyAuthentication,
+ MultiAuthentication,
+ SessionAuthentication
+)
from tastypie.resources import ModelResource
from tastypie.constants import ALL, ALL_WITH_RELATIONS
from wger.core.api.resources import DaysOfWeekResource
from wger.exercises.api.resources import ExerciseResource
from wger.utils.resources import UserObjectsOnlyAuthorization
-from wger.manager.models import WorkoutSession
-from wger.manager.models import Workout
-from wger.manager.models import Schedule
-from wger.manager.models import ScheduleStep
-from wger.manager.models import Day
-from wger.manager.models import Set
-from wger.manager.models import Setting
-from wger.manager.models import WorkoutLog
+from wger.manager.models import (
+ WorkoutSession,
+ Workout,
+ Schedule,
+ ScheduleStep,
+ Day,
+ Set,
+ Setting,
+ WorkoutLog
+)
class WorkoutResource(ModelResource):
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index 4491e5f5b..2f9391596 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -20,13 +20,16 @@ from rest_framework import serializers
from wger.core.api.serializers import DaysOfWeekSerializer
from wger.exercises.api.serializers import ExerciseSerializer
-from wger.manager.models import Workout, ScheduleStep
-from wger.manager.models import Day
-from wger.manager.models import Setting
-from wger.manager.models import Set
-from wger.manager.models import Schedule
-from wger.manager.models import WorkoutLog
-from wger.manager.models import WorkoutSession
+from wger.manager.models import (
+ Workout,
+ ScheduleStep,
+ Day,
+ Setting,
+ Set,
+ Schedule,
+ WorkoutLog,
+ WorkoutSession
+)
class WorkoutSerializer(serializers.ModelSerializer):
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.py
index d5de030bb..77965e51c 100644
--- a/wger/manager/api/views.py
+++ b/wger/manager/api/views.py
@@ -21,23 +21,27 @@ from rest_framework import viewsets
from rest_framework.response import Response
from rest_framework.decorators import detail_route
-from wger.manager.api.serializers import WorkoutSerializer, ScheduleStepSerializer
-from wger.manager.api.serializers import WorkoutCanonicalFormSerializer
-from wger.manager.api.serializers import DaySerializer
-from wger.manager.api.serializers import SettingSerializer
-from wger.manager.api.serializers import SetSerializer
-from wger.manager.api.serializers import ScheduleSerializer
-from wger.manager.api.serializers import WorkoutLogSerializer
-from wger.manager.api.serializers import WorkoutSessionSerializer
-
-from wger.manager.models import Workout
-from wger.manager.models import Set
-from wger.manager.models import ScheduleStep
-from wger.manager.models import Schedule
-from wger.manager.models import Day
-from wger.manager.models import Setting
-from wger.manager.models import WorkoutLog
-from wger.manager.models import WorkoutSession
+from wger.manager.api.serializers import (
+ WorkoutSerializer,
+ ScheduleStepSerializer,
+ WorkoutCanonicalFormSerializer,
+ DaySerializer,
+ SettingSerializer,
+ SetSerializer,
+ ScheduleSerializer,
+ WorkoutLogSerializer,
+ WorkoutSessionSerializer
+)
+from wger.manager.models import (
+ Workout,
+ Set,
+ ScheduleStep,
+ Schedule,
+ Day,
+ Setting,
+ WorkoutLog,
+ WorkoutSession
+)
from wger.utils.viewsets import WgerOwnerObjectModelViewSet
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index 95ef4a432..626729824 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -18,27 +18,33 @@
This file contains forms used in the application
'''
-from django.forms import Form, MultipleHiddenInput
-from django.forms import ModelForm
-from django.forms import DateField
-from django.forms import CharField
-from django.forms import widgets
-from django.forms import ModelChoiceField
+from django.forms import (
+ Form,
+ MultipleHiddenInput,
+ ModelForm,
+ DateField,
+ CharField,
+ widgets,
+ ModelChoiceField
+)
from django.utils.translation import ugettext as _
from captcha.fields import ReCaptchaField
-from wger.exercises.models import Exercise
-from wger.exercises.models import ExerciseCategory
-from wger.manager.models import WorkoutSession
-from wger.manager.models import Workout
-from wger.manager.models import Day
-from wger.manager.models import Set
-from wger.manager.models import Setting
-from wger.manager.models import WorkoutLog
-from wger.utils.widgets import TranslatedSelectMultiple
-from wger.utils.widgets import TranslatedSelect
-from wger.utils.widgets import ExerciseAjaxSelect
+from wger.exercises.models import Exercise, ExerciseCategory
+from wger.manager.models import (
+ WorkoutSession,
+ Workout,
+ Day,
+ Set,
+ Setting,
+ WorkoutLog
+)
+from wger.utils.widgets import (
+ TranslatedSelectMultiple,
+ TranslatedSelect,
+ ExerciseAjaxSelect
+)
from wger.utils.constants import DATE_FORMATS
from wger.utils.widgets import Html5DateInput
diff --git a/wger/manager/helpers.py b/wger/manager/helpers.py
index 25bb4804e..364484dfd 100644
--- a/wger/manager/helpers.py
+++ b/wger/manager/helpers.py
@@ -20,9 +20,11 @@ from calendar import HTMLCalendar
from reportlab.lib import colors
from reportlab.lib.units import cm
-from reportlab.platypus import Paragraph
-from reportlab.platypus import Table
-from reportlab.platypus import KeepTogether
+from reportlab.platypus import (
+ Paragraph,
+ Table,
+ KeepTogether
+)
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 9b01a6038..148ea43f7 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -34,7 +34,11 @@ from sortedm2m.fields import SortedManyToManyField
from wger.core.models import DaysOfWeek
from wger.exercises.models import Exercise
from wger.manager.helpers import reps_smart_text
-from wger.utils.cache import cache_mapper, reset_workout_canonical_form, reset_workout_log
+from wger.utils.cache import (
+ cache_mapper,
+ reset_workout_canonical_form,
+ reset_workout_log
+)
from wger.utils.fields import Html5DateField
diff --git a/wger/manager/pdf.py b/wger/manager/pdf.py
index 0b42d9772..f5edd6047 100644
--- a/wger/manager/pdf.py
+++ b/wger/manager/pdf.py
@@ -29,10 +29,13 @@ from wger.utils.pdf import styleSheet
from wger.utils.pdf import render_footer
from reportlab.lib.pagesizes import A4, cm
-from reportlab.platypus import Paragraph
-from reportlab.platypus import SimpleDocTemplate
-from reportlab.platypus import Table
-from reportlab.platypus import Spacer
+from reportlab.platypus import (
+ Paragraph,
+ SimpleDocTemplate,
+ Table,
+ Spacer
+)
+
from reportlab.lib import colors
from wger import get_version
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 2f77844f1..21858b8b6 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -18,15 +18,17 @@
from django.conf.urls import patterns, url, include
from django.contrib.auth.decorators import login_required
-from wger.manager.views import schedule
-from wger.manager.views import schedule_step
-from wger.manager.views import ical
-from wger.manager.views import workout
-from wger.manager.views import log
-from wger.manager.views import set
-from wger.manager.views import day
-from wger.manager.views import workout_session
from wger.manager import pdf
+from wger.manager.views import (
+ schedule,
+ schedule_step,
+ ical,
+ workout,
+ log,
+ set,
+ day,
+ workout_session
+)
# sub patterns for workout logs
patterns_log = patterns('',
diff --git a/wger/manager/views/day.py b/wger/manager/views/day.py
index 17b7ccc83..da2348693 100644
--- a/wger/manager/views/day.py
+++ b/wger/manager/views/day.py
@@ -27,8 +27,7 @@ from django.views.generic import CreateView
from django.views.generic import UpdateView
from wger.core.models import DaysOfWeek
-from wger.manager.models import Workout
-from wger.manager.models import Day
+from wger.manager.models import Workout, Day
from wger.manager.forms import DayForm
from wger.utils.generic_views import WgerFormMixin
diff --git a/wger/manager/views/ical.py b/wger/manager/views/ical.py
index 85861a2ec..253f00553 100644
--- a/wger/manager/views/ical.py
+++ b/wger/manager/views/ical.py
@@ -23,15 +23,13 @@ from icalendar import Event
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.http import HttpResponse, HttpResponseForbidden
from django.conf import settings
from django.contrib.sites.models import Site
from wger import get_version
from wger.manager.models import Workout, Schedule
-from wger.utils.helpers import next_weekday
-from wger.utils.helpers import check_token
+from wger.utils.helpers import next_weekday, check_token
logger = logging.getLogger(__name__)
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index f25bd9772..96e5057ec 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -20,32 +20,37 @@ import datetime
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.http import HttpResponseRedirect, HttpResponseForbidden
from django.core.context_processors import csrf
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.utils import formats
-from django.utils.translation import ugettext as _
-from django.utils.translation import ugettext_lazy
+from django.utils.translation import ugettext_lazy, ugettext as _
from django.forms.models import modelformset_factory
-from django.views.generic import UpdateView
-from django.views.generic import CreateView
-from django.views.generic import DetailView
-from django.views.generic import DeleteView
+from django.views.generic import (
+ UpdateView,
+ CreateView,
+ DetailView,
+ DeleteView
+)
from wger.manager.helpers import WorkoutCalendar
-from wger.manager.models import Workout
-from wger.manager.models import WorkoutSession
-from wger.manager.models import Day
-from wger.manager.models import WorkoutLog
-from wger.manager.models import Schedule
-from wger.manager.forms import HelperDateForm
-from wger.manager.forms import HelperWorkoutSessionForm
-from wger.manager.forms import WorkoutLogForm
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from wger.manager.models import (
+ Workout,
+ WorkoutSession,
+ Day,
+ WorkoutLog,
+ Schedule
+)
+from wger.manager.forms import (
+ HelperDateForm,
+ HelperWorkoutSessionForm,
+ WorkoutLogForm
+)
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
from wger.utils.helpers import check_access
from wger.weight.helpers import process_log_entries, group_log_entries
diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py
index 4737e0b00..d70ba994e 100644
--- a/wger/manager/views/schedule.py
+++ b/wger/manager/views/schedule.py
@@ -17,35 +17,38 @@
import logging
import datetime
-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.http import HttpResponse
-from django.core.urlresolvers import reverse_lazy
-from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext_lazy
-from django.utils.translation import ugettext as _
+from django.shortcuts import render, get_object_or_404
+from django.http import (
+ HttpResponseRedirect,
+ HttpResponseForbidden,
+ HttpResponse
+)
+from django.core.urlresolvers import reverse_lazy, reverse
+from django.utils.translation import ugettext_lazy, ugettext as _
from django.contrib.auth.decorators import login_required
-from django.views.generic import CreateView
-from django.views.generic import DeleteView
-from django.views.generic import UpdateView
+from django.views.generic import (
+ CreateView,
+ DeleteView,
+ UpdateView
+)
from reportlab.lib.pagesizes import A4
from reportlab.lib.units import cm
-from reportlab.platypus import SimpleDocTemplate
-from reportlab.platypus import Paragraph
-from reportlab.platypus import Spacer
+from reportlab.platypus import (
+ SimpleDocTemplate,
+ Paragraph,
+ Spacer
+)
from wger.manager.models import Schedule
from wger.manager.helpers import render_workout_day
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
-from wger.utils.helpers import make_token
-from wger.utils.helpers import check_token
-from wger.utils.pdf import styleSheet
-from wger.utils.pdf import render_footer
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
+from wger.utils.helpers import make_token, check_token
+from wger.utils.pdf import styleSheet, render_footer
logger = logging.getLogger(__name__)
diff --git a/wger/manager/views/schedule_step.py b/wger/manager/views/schedule_step.py
index 4cd5f1ff6..159d0b567 100644
--- a/wger/manager/views/schedule_step.py
+++ b/wger/manager/views/schedule_step.py
@@ -17,23 +17,25 @@
import logging
from django.core.urlresolvers import reverse
-from django.utils.translation import ugettext_lazy
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy, ugettext as _
from django.db import models
-from django.forms import ModelForm
-from django.forms import ModelChoiceField
-
-from django.views.generic import CreateView
-from django.views.generic import DeleteView
-from django.views.generic import UpdateView
-
-from wger.manager.models import Schedule
-from wger.manager.models import ScheduleStep
-from wger.manager.models import Workout
-
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from django.forms import ModelForm, ModelChoiceField
+from django.views.generic import (
+ CreateView,
+ DeleteView,
+ UpdateView
+)
+
+from wger.manager.models import (
+ Schedule,
+ ScheduleStep,
+ Workout
+)
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
logger = logging.getLogger(__name__)
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index e0555cfe2..4ced75b40 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -16,24 +16,25 @@
import logging
-from django.forms.models import modelformset_factory
-from django.forms.models import inlineformset_factory
-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.forms.models import modelformset_factory, inlineformset_factory
+from django.shortcuts import render, get_object_or_404
+from django.http import HttpResponseRedirect, HttpResponseForbidden
from django.core.urlresolvers import reverse
from django.core.exceptions import ObjectDoesNotExist
from django.db import models
from django.contrib.auth.decorators import login_required
-from wger.manager.models import Day
-from wger.manager.models import Set
-from wger.manager.models import Setting
+from wger.manager.models import (
+ Day,
+ Set,
+ Setting
+)
from wger.exercises.models import Exercise
-from wger.manager.forms import SetForm
-from wger.manager.forms import SetFormMobile
-from wger.manager.forms import SettingForm
+from wger.manager.forms import (
+ SetForm,
+ SetFormMobile,
+ SettingForm
+)
from wger.utils.language import load_item_languages
from wger.config.models import LanguageConfig
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index 6b432b7bf..92daec482 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -18,29 +18,31 @@ import logging
import uuid
import datetime
-from django.shortcuts import render
-from django.shortcuts import get_object_or_404
+from django.shortcuts import render, get_object_or_404
from django.http import HttpResponseRedirect, HttpResponseForbidden
from django.core.context_processors import csrf
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
-from django.utils.translation import ugettext as _
-from django.utils.translation import ugettext_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
+from django.utils.translation import ugettext_lazy, ugettext as _
from django.contrib.auth.decorators import login_required
-from django.views.generic import DeleteView
-from django.views.generic import UpdateView
-
-from wger.manager.models import Workout
-from wger.manager.models import WorkoutSession
-from wger.manager.models import WorkoutLog
-from wger.manager.models import Schedule
-from wger.manager.models import Day
-from wger.manager.forms import WorkoutForm
-from wger.manager.forms import WorkoutSessionHiddenFieldsForm
-from wger.manager.forms import WorkoutCopyForm
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from django.views.generic import DeleteView, UpdateView
+
+from wger.manager.models import (
+ Workout,
+ WorkoutSession,
+ WorkoutLog,
+ Schedule,
+ Day
+)
+from wger.manager.forms import (
+ WorkoutForm,
+ WorkoutSessionHiddenFieldsForm,
+ WorkoutCopyForm
+)
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
from wger.utils.helpers import make_token
diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.py
index d42aad944..243a8d7d4 100644
--- a/wger/manager/views/workout_session.py
+++ b/wger/manager/views/workout_session.py
@@ -17,19 +17,26 @@
import logging
import datetime
-from django.http import HttpResponseForbidden
-from django.http import HttpResponseBadRequest
+from django.http import HttpResponseForbidden, HttpResponseBadRequest
from django.core.urlresolvers import reverse, reverse_lazy
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import ugettext_lazy, ugettext as _
+from django.views.generic import (
+ UpdateView,
+ DeleteView,
+ CreateView
+)
-from django.views.generic import UpdateView, DeleteView
-from django.views.generic import CreateView
from wger.manager.forms import WorkoutSessionForm
-
-from wger.manager.models import Workout, WorkoutSession, WorkoutLog
-
-from wger.utils.generic_views import WgerFormMixin, WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from wger.manager.models import (
+ Workout,
+ WorkoutSession,
+ WorkoutLog
+)
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
logger = logging.getLogger(__name__)
diff --git a/wger/nutrition/api/resources.py b/wger/nutrition/api/resources.py
index f1c4989d4..74740a5c7 100644
--- a/wger/nutrition/api/resources.py
+++ b/wger/nutrition/api/resources.py
@@ -19,16 +19,16 @@ from tastypie.authentication import ApiKeyAuthentication
from tastypie.resources import ModelResource
from tastypie.constants import ALL, ALL_WITH_RELATIONS
-from wger.nutrition.models import Ingredient
-from wger.nutrition.models import WeightUnit
-from wger.nutrition.models import IngredientWeightUnit
-from wger.nutrition.models import NutritionPlan
-from wger.nutrition.models import Meal
-from wger.nutrition.models import MealItem
+from wger.nutrition.models import (
+ Ingredient,
+ WeightUnit,
+ IngredientWeightUnit,
+ NutritionPlan,
+ Meal,
+ MealItem
+)
from wger.utils.resources import UserObjectsOnlyAuthorization
-
-from wger.core.api.resources import LicenseResource
-from wger.core.api.resources import LanguageResource
+from wger.core.api.resources import LicenseResource, LanguageResource
class IngredientResource(ModelResource):
diff --git a/wger/nutrition/api/serializers.py b/wger/nutrition/api/serializers.py
index 453140f01..1c2902e1e 100644
--- a/wger/nutrition/api/serializers.py
+++ b/wger/nutrition/api/serializers.py
@@ -16,8 +16,14 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
from rest_framework import serializers
-from wger.nutrition.models import NutritionPlan, IngredientWeightUnit, \
- WeightUnit, MealItem, Meal, Ingredient
+from wger.nutrition.models import (
+ NutritionPlan,
+ IngredientWeightUnit,
+ WeightUnit,
+ MealItem,
+ Meal,
+ Ingredient
+)
class NutritionPlanSerializer(serializers.ModelSerializer):
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.py
index 5ca2e24e3..3d2edc030 100644
--- a/wger/nutrition/api/views.py
+++ b/wger/nutrition/api/views.py
@@ -20,20 +20,24 @@ from rest_framework.decorators import detail_route
from rest_framework.decorators import api_view
from rest_framework.response import Response
-from wger.nutrition.api.serializers import NutritionPlanSerializer, \
- IngredientWeightUnitSerializer, WeightUnitSerializer, MealItemSerializer, \
- MealSerializer, IngredientSerializer
+from wger.nutrition.api.serializers import (
+ NutritionPlanSerializer,
+ IngredientWeightUnitSerializer,
+ WeightUnitSerializer,
+ MealItemSerializer,
+ MealSerializer,
+ IngredientSerializer
+)
from wger.nutrition.forms import UnitChooserForm
-
-from wger.nutrition.models import Ingredient
-from wger.nutrition.models import Meal
-from wger.nutrition.models import MealItem
-from wger.nutrition.models import WeightUnit
-from wger.nutrition.models import IngredientWeightUnit
-from wger.nutrition.models import NutritionPlan
-
-from wger.utils.language import load_ingredient_languages
-from wger.utils.language import load_language
+from wger.nutrition.models import (
+ Ingredient,
+ Meal,
+ MealItem,
+ WeightUnit,
+ IngredientWeightUnit,
+ NutritionPlan
+)
+from wger.utils.language import load_ingredient_languages, load_language
from wger.utils.viewsets import WgerOwnerObjectModelViewSet
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index 27d2dc2ef..0e3277ded 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -20,7 +20,11 @@ from django import forms
from django.utils.translation import ugettext as _
from wger.core.models import UserProfile
-from wger.nutrition.models import IngredientWeightUnit, Ingredient, MealItem
+from wger.nutrition.models import (
+ IngredientWeightUnit,
+ Ingredient,
+ MealItem
+)
from wger.utils.widgets import Html5NumberInput
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index 336d4b292..74d3d4107 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -21,8 +21,7 @@ from django.db import models
from django.template.loader import render_to_string
from django.template.defaultfilters import slugify # django.utils.text.slugify in django 1.5!
-from django.core.validators import MaxValueValidator
-from django.core.validators import MinValueValidator
+from django.core.validators import MaxValueValidator, MinValueValidator
from django.core.exceptions import ValidationError
from django.core.urlresolvers import reverse
from django.core import mail
@@ -33,9 +32,7 @@ from django.utils.translation import ugettext_lazy as _
from django.utils import translation
from wger.core.models import Language
-
-from wger.utils.constants import EMAIL_FROM
-from wger.utils.constants import TWOPLACES
+from wger.utils.constants import EMAIL_FROM, TWOPLACES
from wger.utils.cache import cache_mapper
from wger.utils.fields import Html5TimeField
from wger.utils.models import AbstractLicenseModel
diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.py
index 827139ab9..d9a1ec0f6 100644
--- a/wger/nutrition/tests/test_ingredient.py
+++ b/wger/nutrition/tests/test_ingredient.py
@@ -26,10 +26,12 @@ from wger.nutrition.models import Meal
from wger.utils.constants import NUTRITION_TAB
-from wger.manager.tests.testcase import WorkoutManagerTestCase
-from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
-from wger.manager.tests.testcase import WorkoutManagerEditTestCase
-from wger.manager.tests.testcase import WorkoutManagerAddTestCase
+from wger.manager.tests.testcase import (
+ WorkoutManagerTestCase,
+ WorkoutManagerDeleteTestCase,
+ WorkoutManagerEditTestCase,
+ WorkoutManagerAddTestCase
+)
class IngredientRepresentationTestCase(WorkoutManagerTestCase):
diff --git a/wger/nutrition/tests/test_meal.py b/wger/nutrition/tests/test_meal.py
index 880eb73ad..e18ca13f6 100644
--- a/wger/nutrition/tests/test_meal.py
+++ b/wger/nutrition/tests/test_meal.py
@@ -21,9 +21,11 @@ from wger.core.tests import api_base_test
from wger.nutrition.models import Meal
from wger.nutrition.models import NutritionPlan
-from wger.manager.tests.testcase import WorkoutManagerTestCase
-from wger.manager.tests.testcase import WorkoutManagerEditTestCase
-from wger.manager.tests.testcase import WorkoutManagerAddTestCase
+from wger.manager.tests.testcase import (
+ WorkoutManagerTestCase,
+ WorkoutManagerEditTestCase,
+ WorkoutManagerAddTestCase
+)
class MealRepresentationTestCase(WorkoutManagerTestCase):
diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.py
index 5637d0766..c3c5159b8 100644
--- a/wger/nutrition/urls.py
+++ b/wger/nutrition/urls.py
@@ -15,17 +15,23 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-from django.conf.urls import patterns, url, include
from django.contrib.auth.decorators import login_required
+from django.conf.urls import (
+ patterns,
+ url,
+ include
+)
-from wger.nutrition.views import ingredient
-from wger.nutrition.views import bmi
-from wger.nutrition.views import calculator
-from wger.nutrition.views import plan
-from wger.nutrition.views import meal
-from wger.nutrition.views import meal_item
-from wger.nutrition.views import unit
-from wger.nutrition.views import unit_ingredient
+from wger.nutrition.views import (
+ ingredient,
+ bmi,
+ calculator,
+ plan,
+ meal,
+ meal_item,
+ unit,
+ unit_ingredient
+)
# sub patterns for nutritional plans
patterns_plan = patterns('',
diff --git a/wger/nutrition/views/calculator.py b/wger/nutrition/views/calculator.py
index 10a4ce4f5..17b4624c3 100644
--- a/wger/nutrition/views/calculator.py
+++ b/wger/nutrition/views/calculator.py
@@ -22,9 +22,11 @@ from django.contrib.auth.decorators import login_required
from django.http import HttpResponse
from django.shortcuts import render
-from wger.nutrition.forms import BmrForm
-from wger.nutrition.forms import PhysicalActivitiesForm
-from wger.nutrition.forms import DailyCaloriesForm
+from wger.nutrition.forms import (
+ BmrForm,
+ PhysicalActivitiesForm,
+ DailyCaloriesForm
+)
logger = logging.getLogger(__name__)
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index edff43a63..90b2ca455 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -15,31 +15,30 @@
# You should have received a copy of the GNU Affero General Public License
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.shortcuts import render, get_object_or_404
+from django.http import HttpResponseRedirect, HttpResponseForbidden
from django.core import mail
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.core.cache import cache
from django.contrib.auth.decorators import permission_required
from django.contrib import messages
-from django.utils.translation import ugettext as _
-from django.utils.translation import ugettext_lazy
-from django.views.generic import DeleteView
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
-from django.views.generic import ListView
+from django.utils.translation import ugettext_lazy, ugettext as _
+from django.views.generic import (
+ DeleteView,
+ CreateView,
+ UpdateView,
+ ListView
+)
from wger.nutrition.forms import UnitChooserForm
from wger.nutrition.models import Ingredient
-from wger.utils.generic_views import WgerPermissionMixin
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
+from wger.utils.generic_views import (
+ WgerPermissionMixin,
+ WgerFormMixin,
+ WgerDeleteMixin
+)
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
-from wger.utils.language import load_language
-from wger.utils.language import load_ingredient_languages
+from wger.utils.language import load_language, load_ingredient_languages
from wger.utils.cache import cache_mapper
diff --git a/wger/nutrition/views/meal.py b/wger/nutrition/views/meal.py
index 199c4cbe4..291d8a591 100644
--- a/wger/nutrition/views/meal.py
+++ b/wger/nutrition/views/meal.py
@@ -16,18 +16,14 @@
import logging
from django.shortcuts import get_object_or_404
-from django.http import HttpResponseRedirect
-from django.http import HttpResponseForbidden
+from django.http import HttpResponseRedirect, HttpResponseForbidden
from django.core.urlresolvers import reverse
from django.contrib.auth.decorators import login_required
from django.utils.translation import ugettext_lazy
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
-
-from wger.nutrition.models import NutritionPlan
-from wger.nutrition.models import Meal
+from django.views.generic import CreateView, UpdateView
+from wger.nutrition.models import NutritionPlan, Meal
from wger.utils.generic_views import WgerFormMixin
logger = logging.getLogger(__name__)
diff --git a/wger/nutrition/views/meal_item.py b/wger/nutrition/views/meal_item.py
index 60281921e..20f1c3660 100644
--- a/wger/nutrition/views/meal_item.py
+++ b/wger/nutrition/views/meal_item.py
@@ -16,17 +16,14 @@
import logging
from django.shortcuts import get_object_or_404
-from django.http import HttpResponseRedirect
-from django.http import HttpResponseForbidden
+from django.http import HttpResponseRedirect, HttpResponseForbidden
from django.core.urlresolvers import reverse
from django.contrib.auth.decorators import login_required
from django.utils.translation import ugettext_lazy
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
+from django.views.generic import CreateView, UpdateView
from wger.nutrition.forms import MealItemForm
-from wger.nutrition.models import Meal
-from wger.nutrition.models import MealItem
+from wger.nutrition.models import Meal, MealItem
from wger.utils.generic_views import WgerFormMixin
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index f79cb4625..e4c194e01 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -18,33 +18,34 @@ import six
import logging
import datetime
-from django.shortcuts import render
-from django.shortcuts import get_object_or_404
-from django.http import HttpResponse
-from django.http import HttpResponseForbidden
-from django.http import HttpResponseRedirect
+from django.shortcuts import render, get_object_or_404
+from django.http import (
+ HttpResponse,
+ HttpResponseForbidden,
+ HttpResponseRedirect
+)
from django.core.context_processors import csrf
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.contrib.auth.decorators import login_required
-from django.utils.translation import ugettext as _
-from django.utils.translation import ugettext_lazy
-from django.views.generic import DeleteView
-from django.views.generic import UpdateView
+from django.utils.translation import ugettext_lazy, ugettext as _
+from django.views.generic import DeleteView, UpdateView
-from reportlab.lib.pagesizes import A4, cm
-from reportlab.platypus import Paragraph
-from reportlab.platypus import SimpleDocTemplate
-from reportlab.platypus import Table
-from reportlab.platypus import Spacer
from reportlab.lib import colors
-
-from wger.nutrition.models import NutritionPlan
-from wger.nutrition.models import MEALITEM_WEIGHT_GRAM
-from wger.nutrition.models import MEALITEM_WEIGHT_UNIT
+from reportlab.lib.pagesizes import A4, cm
+from reportlab.platypus import (
+ Paragraph,
+ SimpleDocTemplate,
+ Table,
+ Spacer
+)
+
+from wger.nutrition.models import (
+ NutritionPlan,
+ MEALITEM_WEIGHT_GRAM,
+ MEALITEM_WEIGHT_UNIT
+)
from wger import get_version
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
+from wger.utils.generic_views import WgerFormMixin, WgerDeleteMixin
from wger.utils.helpers import check_token, make_token
from wger.utils.pdf import styleSheet
from wger.utils.language import load_language
diff --git a/wger/nutrition/views/unit.py b/wger/nutrition/views/unit.py
index 6f5ed8b13..ee491dae4 100644
--- a/wger/nutrition/views/unit.py
+++ b/wger/nutrition/views/unit.py
@@ -15,23 +15,24 @@
# You should have received a copy of the GNU Affero General Public License
import logging
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
-from django.utils.translation import ugettext_lazy
-from django.utils.translation import ugettext as _
+from django.core.urlresolvers import reverse, reverse_lazy
+from django.utils.translation import ugettext_lazy, ugettext as _
-from django.views.generic import DeleteView
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
-from django.views.generic import ListView
+from django.views.generic import (
+ DeleteView,
+ CreateView,
+ UpdateView,
+ ListView
+)
from wger.nutrition.models import WeightUnit
-
-from wger.utils.generic_views import WgerPermissionMixin
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
from wger.utils.language import load_language
+from wger.utils.generic_views import (
+ WgerPermissionMixin,
+ WgerFormMixin,
+ WgerDeleteMixin
+)
logger = logging.getLogger(__name__)
# ************************
diff --git a/wger/nutrition/views/unit_ingredient.py b/wger/nutrition/views/unit_ingredient.py
index 0287fa585..a876439d3 100644
--- a/wger/nutrition/views/unit_ingredient.py
+++ b/wger/nutrition/views/unit_ingredient.py
@@ -17,22 +17,25 @@ import logging
from django.shortcuts import get_object_or_404
from django.core.urlresolvers import reverse
-from django.forms import ModelForm
-from django.forms import ModelChoiceField
+from django.forms import ModelForm, ModelChoiceField
from django.utils.translation import ugettext_lazy
-from django.views.generic import DeleteView
-from django.views.generic import CreateView
-from django.views.generic import UpdateView
-
-from wger.nutrition.models import Ingredient
-from wger.nutrition.models import IngredientWeightUnit
-from wger.nutrition.models import WeightUnit
-
from wger.utils.language import load_language
-from wger.utils.generic_views import WgerFormMixin
-from wger.utils.generic_views import WgerDeleteMixin
-from wger.utils.generic_views import WgerPermissionMixin
+from django.views.generic import (
+ DeleteView,
+ CreateView,
+ UpdateView
+)
+from wger.nutrition.models import (
+ Ingredient,
+ IngredientWeightUnit,
+ WeightUnit
+)
+from wger.utils.generic_views import (
+ WgerFormMixin,
+ WgerDeleteMixin,
+ WgerPermissionMixin
+)
logger = logging.getLogger(__name__)
diff --git a/wger/software/templates/changelog.html b/wger/software/templates/changelog.html
index 6792a58c5..f1204545a 100644
--- a/wger/software/templates/changelog.html
+++ b/wger/software/templates/changelog.html
@@ -25,6 +25,7 @@
</li>
<li>
Other improvements and bugfixes
+ <a href="https://github.com/rolandgeider/wger/issues/190">#190</a>
<a href="https://github.com/rolandgeider/wger/issues/185">#185</a>
<a href="https://github.com/rolandgeider/wger/issues/178">#179</a>
<a href="https://github.com/rolandgeider/wger/issues/150">#150</a>
diff --git a/wger/utils/fields.py b/wger/utils/fields.py
index f349ff2d5..ad5f3f4fe 100644
--- a/wger/utils/fields.py
+++ b/wger/utils/fields.py
@@ -16,8 +16,7 @@ import logging
from django.db import models
-from wger.utils.widgets import Html5FormDateField
-from wger.utils.widgets import Html5FormTimeField
+from wger.utils.widgets import Html5FormDateField, Html5FormTimeField
logger = logging.getLogger(__name__)
diff --git a/wger/utils/generic_views.py b/wger/utils/generic_views.py
index 53b9aef92..3ef617f72 100644
--- a/wger/utils/generic_views.py
+++ b/wger/utils/generic_views.py
@@ -19,17 +19,17 @@ import bleach
from django.utils.translation import ugettext_lazy
from django.contrib import messages
-from django.core.urlresolvers import reverse
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from django.core.context_processors import csrf
from django.views.generic.edit import ModelFormMixin
from django.views.generic import TemplateView
-from django.http import HttpResponseRedirect
-from django.http import HttpResponseForbidden
+from django.http import HttpResponseRedirect, HttpResponseForbidden
-from wger.utils.constants import HTML_TAG_WHITELIST
-from wger.utils.constants import HTML_ATTRIBUTES_WHITELIST
-from wger.utils.constants import HTML_STYLES_WHITELIST
+from wger.utils.constants import (
+ HTML_TAG_WHITELIST,
+ HTML_ATTRIBUTES_WHITELIST,
+ HTML_STYLES_WHITELIST
+)
logger = logging.getLogger(__name__)
diff --git a/wger/utils/pdf.py b/wger/utils/pdf.py
index b2ad57d65..dbff0079c 100644
--- a/wger/utils/pdf.py
+++ b/wger/utils/pdf.py
@@ -12,18 +12,18 @@
#
# You should have received a copy of the GNU Affero General Public License
-from os.path import join as path_join
import datetime
+from os.path import join as path_join
from django.conf import settings
from django.utils import translation
from django.core.exceptions import ObjectDoesNotExist
-from reportlab.lib.styles import ParagraphStyle
-from reportlab.lib.styles import StyleSheet1
+from reportlab.lib.styles import ParagraphStyle, StyleSheet1
from reportlab.pdfbase.ttfonts import TTFont
from reportlab.pdfbase import pdfmetrics
from reportlab.platypus import Paragraph
+
from wger import get_version
from wger.core.models import Language
diff --git a/wger/utils/viewsets.py b/wger/utils/viewsets.py
index 363618cd3..2cc2584ce 100644
--- a/wger/utils/viewsets.py
+++ b/wger/utils/viewsets.py
@@ -15,8 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-from rest_framework import exceptions
-from rest_framework import viewsets
+from rest_framework import exceptions, viewsets
class WgerOwnerObjectModelViewSet(viewsets.ModelViewSet):
diff --git a/wger/utils/widgets.py b/wger/utils/widgets.py
index af9b37984..73a81a352 100644
--- a/wger/utils/widgets.py
+++ b/wger/utils/widgets.py
@@ -17,17 +17,18 @@ import uuid
import logging
from itertools import chain
-from django.forms.widgets import SelectMultiple
-from django.forms.widgets import Select
-from django.forms.widgets import DateInput
-from django.forms.widgets import TextInput
+from django.forms.widgets import (
+ SelectMultiple,
+ Select,
+ DateInput,
+ TextInput
+)
from django.forms import fields
from django.utils.translation import ugettext as _
from django.utils.encoding import force_text
-from django.utils.html import escape
-from django.utils.html import conditional_escape
+from django.utils.html import escape, conditional_escape
from django.utils.safestring import mark_safe