Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Sort imports using isort

Rolanddcd31635699b
diff --git a/manage.py b/manage.py
index d55df6793..f79cb6c7e 100644
--- a/manage.py
+++ b/manage.py
@@ -3,7 +3,7 @@
# Standard Library
import sys
-# Third Party
+# Django
from django.core.management import execute_from_command_line
# wger
diff --git a/setup.cfg b/setup.cfg
index 7b55f4abf..07f84f4b5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -40,14 +40,16 @@ line_length=119
# A comment to consistently place directly above future imports.
import_heading_future=Future
+# A comment to consistently place directly above django imports.
+import_heading_django=Django
+
# A comment to consistently place directly above imports from the standard library.
import_heading_stdlib=Standard Library
# A comment to consistently place directly above thirdparty imports.
import_heading_thirdparty=Third Party
-# A comment to consistently place directly above imports from the current
-# project.
+# A comment to consistently place directly above wger imports.
import_heading_firstparty=wger
# A comment to consistently place directly above imports that start with '.'.
@@ -60,6 +62,7 @@ indent=' '
# A list of imports that will be forced to display withing the first party
# category.
known_first_party=wger
+known_django=django
# An integer that represents how you want imports to be displayed if their long
# enough to span multiple lines. A full definition of all possible modes can be
diff --git a/wger/config/__init__.py b/wger/config/__init__.py
index 1cdac5f30..b0db020b9 100644
--- a/wger/config/__init__.py
+++ b/wger/config/__init__.py
@@ -16,7 +16,9 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+# wger
from wger import get_version
+
VERSION = get_version()
default_app_config = 'wger.config.apps.ConfigConfig'
diff --git a/wger/config/apps.py b/wger/config/apps.py
index dc093f300..45467eee7 100644
--- a/wger/config/apps.py
+++ b/wger/config/apps.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.apps import AppConfig
diff --git a/wger/config/models.py b/wger/config/models.py
index a05f8c88e..705ee5615 100644
--- a/wger/config/models.py
+++ b/wger/config/models.py
@@ -18,7 +18,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.core.cache import cache
from django.db import models
from django.utils.translation import ugettext_lazy as _
diff --git a/wger/config/signals.py b/wger/config/signals.py
index dcbbaac15..7d882b105 100644
--- a/wger/config/signals.py
+++ b/wger/config/signals.py
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.db.models.signals import post_save
from django.dispatch import receiver
diff --git a/wger/config/tests/test_custom_header.py b/wger/config/tests/test_custom_header.py
index 2c18301f5..35d963e74 100644
--- a/wger/config/tests/test_custom_header.py
+++ b/wger/config/tests/test_custom_header.py
@@ -15,7 +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/>.
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/config/tests/test_gym_config.py b/wger/config/tests/test_gym_config.py
index 9bc74dca5..8317ea0d6 100644
--- a/wger/config/tests/test_gym_config.py
+++ b/wger/config/tests/test_gym_config.py
@@ -15,7 +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/>.
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/config/urls.py b/wger/config/urls.py
index 519816f6c..25ea19b62 100644
--- a/wger/config/urls.py
+++ b/wger/config/urls.py
@@ -15,7 +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/>.
-# Third Party
+# Django
from django.conf.urls import (
include,
url
diff --git a/wger/config/views/gym_config.py b/wger/config/views/gym_config.py
index 5aaab334b..8c284d09b 100644
--- a/wger/config/views/gym_config.py
+++ b/wger/config/views/gym_config.py
@@ -17,7 +17,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.urls import (
reverse,
reverse_lazy
diff --git a/wger/config/views/language_config.py b/wger/config/views/language_config.py
index 6d7ca0a85..f1082171e 100644
--- a/wger/config/views/language_config.py
+++ b/wger/config/views/language_config.py
@@ -17,7 +17,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
diff --git a/wger/core/__init__.py b/wger/core/__init__.py
index 703386020..ff2015c66 100644
--- a/wger/core/__init__.py
+++ b/wger/core/__init__.py
@@ -16,7 +16,9 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+# wger
from wger import get_version
+
VERSION = get_version()
default_app_config = 'wger.core.apps.CoreConfig'
diff --git a/wger/core/api/views.py b/wger/core/api/views.py
index 5bf68bb70..6e33346e0 100644
--- a/wger/core/api/views.py
+++ b/wger/core/api/views.py
@@ -15,8 +15,10 @@
# 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/>.
-# Third Party
+# Django
from django.contrib.auth.models import User
+
+# Third Party
from rest_framework import viewsets
from rest_framework.decorators import action
from rest_framework.response import Response
diff --git a/wger/core/apps.py b/wger/core/apps.py
index 6ae7a28ec..17fae27ef 100644
--- a/wger/core/apps.py
+++ b/wger/core/apps.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.apps import AppConfig
diff --git a/wger/core/demo.py b/wger/core/demo.py
index be41076dd..1aa29cee3 100644
--- a/wger/core/demo.py
+++ b/wger/core/demo.py
@@ -20,7 +20,7 @@ import logging
import random
import uuid
-# Third Party
+# Django
from django.contrib.auth import authenticate
from django.contrib.auth.models import User
from django.utils.translation import ugettext as _
diff --git a/wger/core/forms.py b/wger/core/forms.py
index 7ac69084b..73c2ef4d7 100644
--- a/wger/core/forms.py
+++ b/wger/core/forms.py
@@ -14,8 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
-from captcha.fields import ReCaptchaField
+# Django
from django import forms
from django.contrib.auth.forms import (
AuthenticationForm,
@@ -32,6 +31,9 @@ from django.forms import (
)
from django.utils.translation import ugettext as _
+# Third Party
+from captcha.fields import ReCaptchaField
+
# wger
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 90e9f2a14..c88316bf3 100644
--- a/wger/core/management/commands/clear-cache.py
+++ b/wger/core/management/commands/clear-cache.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.core.cache import cache
from django.core.management.base import (
diff --git a/wger/core/management/commands/delete-temp-users.py b/wger/core/management/commands/delete-temp-users.py
index 7750ca2d5..a957bf522 100644
--- a/wger/core/management/commands/delete-temp-users.py
+++ b/wger/core/management/commands/delete-temp-users.py
@@ -17,7 +17,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.core.management.base import BaseCommand
from django.utils.timezone import now
diff --git a/wger/core/management/commands/extract-i18n.py b/wger/core/management/commands/extract-i18n.py
index ca366b948..c1adc5cf6 100644
--- a/wger/core/management/commands/extract-i18n.py
+++ b/wger/core/management/commands/extract-i18n.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core.management.base import BaseCommand
# wger
diff --git a/wger/core/management/commands/update-user-cache.py b/wger/core/management/commands/update-user-cache.py
index 4b09f09e3..7d680f329 100644
--- a/wger/core/management/commands/update-user-cache.py
+++ b/wger/core/management/commands/update-user-cache.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.core.management.base import BaseCommand
diff --git a/wger/core/models.py b/wger/core/models.py
index cc1e2fa6c..0298003dc 100644
--- a/wger/core/models.py
+++ b/wger/core/models.py
@@ -18,16 +18,16 @@
import datetime
import decimal
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.core.exceptions import ValidationError
-from django.urls import reverse
from django.core.validators import (
MaxValueValidator,
MinValueValidator
)
from django.db import models
from django.db.models import IntegerField
+from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
# wger
diff --git a/wger/core/signals.py b/wger/core/signals.py
index 8b933b49a..6031bf35b 100644
--- a/wger/core/signals.py
+++ b/wger/core/signals.py
@@ -15,13 +15,17 @@
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Standard Library
+import datetime
+
+# Django
from django.contrib.auth.models import User
-from django.db.models.signals import post_save, pre_save
+from django.db.models.signals import (
+ post_save,
+ pre_save
+)
from django.dispatch import receiver
-import datetime
-
# wger
from wger.core.models import (
UserCache,
diff --git a/wger/core/templatetags/wger_extras.py b/wger/core/templatetags/wger_extras.py
index c06247f75..0d26daba6 100644
--- a/wger/core/templatetags/wger_extras.py
+++ b/wger/core/templatetags/wger_extras.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django import template
from django.conf import settings
from django.forms.widgets import (
diff --git a/wger/core/tests/api_base_test.py b/wger/core/tests/api_base_test.py
index fe9e2bb6f..47d75eb15 100644
--- a/wger/core/tests/api_base_test.py
+++ b/wger/core/tests/api_base_test.py
@@ -13,8 +13,10 @@
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib.auth.models import User
+
+# Third Party
from rest_framework import status
from rest_framework.test import APITestCase
diff --git a/wger/core/tests/base_testcase.py b/wger/core/tests/base_testcase.py
index cbcb71709..e94b48bd8 100644
--- a/wger/core/tests/base_testcase.py
+++ b/wger/core/tests/base_testcase.py
@@ -19,14 +19,14 @@ import os
import shutil
import tempfile
-# Third Party
+# Django
from django.conf import settings
from django.core.cache import cache
+from django.test import TestCase
from django.urls import (
NoReverseMatch,
reverse
)
-from django.test import TestCase
# wger
from wger.utils.constants import TWOPLACES
diff --git a/wger/core/tests/test_apikey.py b/wger/core/tests/test_apikey.py
index 9ce8e6564..cd2222585 100644
--- a/wger/core/tests/test_apikey.py
+++ b/wger/core/tests/test_apikey.py
@@ -15,9 +15,11 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
+
+# Third Party
from rest_framework.authtoken.models import Token
# wger
diff --git a/wger/core/tests/test_change_password.py b/wger/core/tests/test_change_password.py
index bc388ad6e..c06f8ce8d 100644
--- a/wger/core/tests/test_change_password.py
+++ b/wger/core/tests/test_change_password.py
@@ -15,7 +15,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/core/tests/test_delete_user.py b/wger/core/tests/test_delete_user.py
index 899ff9676..735a2e632 100644
--- a/wger/core/tests/test_delete_user.py
+++ b/wger/core/tests/test_delete_user.py
@@ -15,7 +15,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/core/tests/test_feedback.py b/wger/core/tests/test_feedback.py
index a87466b2d..786df60e0 100644
--- a/wger/core/tests/test_feedback.py
+++ b/wger/core/tests/test_feedback.py
@@ -12,13 +12,15 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Standard Library
+from unittest import skip
+
+# Django
from django.core import mail
from django.urls import reverse
# wger
from wger.core.tests.base_testcase import WorkoutManagerTestCase
-from unittest import skip
class FeedbackTestCase(WorkoutManagerTestCase):
diff --git a/wger/core/tests/test_index.py b/wger/core/tests/test_index.py
index af5b17e9f..5e058a994 100644
--- a/wger/core/tests/test_index.py
+++ b/wger/core/tests/test_index.py
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/core/tests/test_language.py b/wger/core/tests/test_language.py
index 11dab8c89..253f6c556 100644
--- a/wger/core/tests/test_language.py
+++ b/wger/core/tests/test_language.py
@@ -15,7 +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/>.
-# Third Party
+# Django
from django.urls import reverse_lazy
# wger
diff --git a/wger/core/tests/test_preferences.py b/wger/core/tests/test_preferences.py
index 64b8547b5..e02a3c693 100644
--- a/wger/core/tests/test_preferences.py
+++ b/wger/core/tests/test_preferences.py
@@ -17,7 +17,7 @@ import datetime
import decimal
import logging
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/core/tests/test_registration.py b/wger/core/tests/test_registration.py
index 46119bbf7..c048cc5ea 100644
--- a/wger/core/tests/test_registration.py
+++ b/wger/core/tests/test_registration.py
@@ -15,7 +15,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/core/tests/test_robots_txt.py b/wger/core/tests/test_robots_txt.py
index 1b7159748..c6073113d 100644
--- a/wger/core/tests/test_robots_txt.py
+++ b/wger/core/tests/test_robots_txt.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/core/tests/test_sitemap.py b/wger/core/tests/test_sitemap.py
index 529c0cbdd..a1c5f5fc7 100644
--- a/wger/core/tests/test_sitemap.py
+++ b/wger/core/tests/test_sitemap.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/core/tests/test_spaceless.py b/wger/core/tests/test_spaceless.py
index 1b1985f2f..20aa21ec4 100644
--- a/wger/core/tests/test_spaceless.py
+++ b/wger/core/tests/test_spaceless.py
@@ -15,7 +15,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.template import (
Context,
Template
diff --git a/wger/core/tests/test_temporary_users.py b/wger/core/tests/test_temporary_users.py
index f43ccfc93..04d9579df 100644
--- a/wger/core/tests/test_temporary_users.py
+++ b/wger/core/tests/test_temporary_users.py
@@ -16,7 +16,7 @@
import datetime
import random
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.core.management import call_command
from django.urls import reverse
diff --git a/wger/core/tests/test_user.py b/wger/core/tests/test_user.py
index 6d792c704..ac8f0a56a 100644
--- a/wger/core/tests/test_user.py
+++ b/wger/core/tests/test_user.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import (
reverse,
diff --git a/wger/core/urls.py b/wger/core/urls.py
index d47b1b5a2..580eb7aa2 100644
--- a/wger/core/urls.py
+++ b/wger/core/urls.py
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.conf.urls import (
include,
url
@@ -25,6 +25,7 @@ from django.urls import reverse_lazy
from django.views.generic import TemplateView
# wger
+from wger.core.forms import UserLoginForm
from wger.core.views import (
languages,
license,
@@ -34,7 +35,6 @@ from wger.core.views import (
weight_units
)
-from wger.core.forms import UserLoginForm
# sub patterns for languages
patterns_language = [
diff --git a/wger/core/views/languages.py b/wger/core/views/languages.py
index 7155de212..813d7fdbd 100644
--- a/wger/core/views/languages.py
+++ b/wger/core/views/languages.py
@@ -17,7 +17,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
@@ -41,9 +41,9 @@ from django.views.generic import (
# wger
from wger.core.models import Language
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
diff --git a/wger/core/views/license.py b/wger/core/views/license.py
index ea2249fba..045f910e0 100644
--- a/wger/core/views/license.py
+++ b/wger/core/views/license.py
@@ -17,7 +17,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
@@ -40,9 +40,9 @@ from django.views.generic import (
# wger
from wger.core.models import License
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
diff --git a/wger/core/views/misc.py b/wger/core/views/misc.py
index 8f42c324e..31b4d0905 100644
--- a/wger/core/views/misc.py
+++ b/wger/core/views/misc.py
@@ -17,23 +17,23 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.conf import settings
from django.contrib import messages
from django.contrib.auth import login as django_login
from django.contrib.auth.decorators import login_required
from django.core import mail
from django.core.exceptions import ObjectDoesNotExist
+from django.http import HttpResponseRedirect
+from django.template.loader import render_to_string
from django.urls import (
reverse,
reverse_lazy
)
-from django.http import HttpResponseRedirect
-from django.template.loader import render_to_string
from django.utils.translation import ugettext as _
+from django.views.decorators.vary import vary_on_headers
from django.views.generic import TemplateView
from django.views.generic.edit import FormView
-from django.views.decorators.vary import vary_on_headers
# wger
from wger.core.demo import (
@@ -47,9 +47,9 @@ from wger.core.forms import (
from wger.core.models import DaysOfWeek
from wger.manager.models import Schedule
from wger.nutrition.models import NutritionPlan
+from wger.utils.helpers import ua_aware_render
from wger.weight.helpers import get_last_entries
from wger.weight.models import WeightEntry
-from wger.utils.helpers import ua_aware_render
logger = logging.getLogger(__name__)
diff --git a/wger/core/views/repetition_units.py b/wger/core/views/repetition_units.py
index ddb421dfe..58c0903c7 100644
--- a/wger/core/views/repetition_units.py
+++ b/wger/core/views/repetition_units.py
@@ -17,13 +17,13 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
-from django.urls import reverse_lazy
from django.http import HttpResponseForbidden
+from django.urls import reverse_lazy
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -38,9 +38,9 @@ from django.views.generic import (
# wger
from wger.core.models import RepetitionUnit
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 25a261090..17b01123b 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -17,7 +17,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.conf import settings
from django.contrib import messages
from django.contrib.auth import (
@@ -32,13 +32,13 @@ from django.contrib.auth.mixins import (
)
from django.contrib.auth.models import User
from django.contrib.auth.views import LoginView
-from django.urls import reverse
from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
from django.shortcuts import get_object_or_404
from django.template.context_processors import csrf
+from django.urls import reverse
from django.utils import translation
from django.utils.translation import (
ugettext as _,
@@ -50,6 +50,8 @@ from django.views.generic import (
RedirectView,
UpdateView
)
+
+# Third Party
from rest_framework.authtoken.models import Token
# wger
@@ -76,16 +78,16 @@ from wger.manager.models import (
from wger.nutrition.models import NutritionPlan
from wger.utils.constants import USER_TAB
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerFormMixin,
- WgerMultiplePermissionRequiredMixin,
- UAAwareViewMixin
+ WgerMultiplePermissionRequiredMixin
)
+from wger.utils.helpers import ua_aware_render
from wger.utils.user_agents import (
check_request_amazon,
check_request_android
)
from wger.weight.models import WeightEntry
-from wger.utils.helpers import ua_aware_render
logger = logging.getLogger(__name__)
diff --git a/wger/core/views/weight_units.py b/wger/core/views/weight_units.py
index 1393197e9..8a30a9ca8 100644
--- a/wger/core/views/weight_units.py
+++ b/wger/core/views/weight_units.py
@@ -17,13 +17,13 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
-from django.urls import reverse_lazy
from django.http import HttpResponseForbidden
+from django.urls import reverse_lazy
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -38,9 +38,9 @@ from django.views.generic import (
# wger
from wger.core.models import WeightUnit
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
diff --git a/wger/email/__init__.py b/wger/email/__init__.py
index 009b7dfe6..419385554 100644
--- a/wger/email/__init__.py
+++ b/wger/email/__init__.py
@@ -15,7 +15,9 @@
# 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/>.
+# wger
from wger import get_version
+
VERSION = get_version()
default_app_config = 'wger.email.apps.Config'
diff --git a/wger/email/apps.py b/wger/email/apps.py
index 49f435257..7880ce4b4 100644
--- a/wger/email/apps.py
+++ b/wger/email/apps.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.apps import AppConfig
diff --git a/wger/email/forms.py b/wger/email/forms.py
index 7bdc0acfa..3f977d3f7 100644
--- a/wger/email/forms.py
+++ b/wger/email/forms.py
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.forms import (
CharField,
Form,
diff --git a/wger/email/management/commands/send-mass-emails.py b/wger/email/management/commands/send-mass-emails.py
index 2e58a1a7a..5a6959548 100644
--- a/wger/email/management/commands/send-mass-emails.py
+++ b/wger/email/management/commands/send-mass-emails.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.conf import settings
from django.core import mail
from django.core.management.base import BaseCommand
diff --git a/wger/email/models.py b/wger/email/models.py
index 96e332e5c..e073b244c 100644
--- a/wger/email/models.py
+++ b/wger/email/models.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.db import models
diff --git a/wger/email/tests/test_gym_emails.py b/wger/email/tests/test_gym_emails.py
index 6d29081bc..92d552593 100644
--- a/wger/email/tests/test_gym_emails.py
+++ b/wger/email/tests/test_gym_emails.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/email/urls.py b/wger/email/urls.py
index e9c9db2d4..a7a022676 100644
--- a/wger/email/urls.py
+++ b/wger/email/urls.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.conf.urls import (
include,
url
diff --git a/wger/email/views/gym.py b/wger/email/views/gym.py
index 44b951c08..8fc68a645 100644
--- a/wger/email/views/gym.py
+++ b/wger/email/views/gym.py
@@ -14,17 +14,19 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.conf import settings
from django.contrib.auth.mixins import PermissionRequiredMixin
from django.core import mail
-from django.urls import reverse
from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
from django.shortcuts import get_object_or_404
+from django.urls import reverse
from django.views import generic
+
+# Third Party
from formtools.preview import FormPreview
# wger
diff --git a/wger/exercises/__init__.py b/wger/exercises/__init__.py
index 7d76565c1..1857b73d9 100644
--- a/wger/exercises/__init__.py
+++ b/wger/exercises/__init__.py
@@ -16,7 +16,9 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+# wger
from wger import get_version
+
VERSION = get_version()
default_app_config = 'wger.exercises.apps.ExerciseConfig'
diff --git a/wger/exercises/admin.py b/wger/exercises/admin.py
index 65a4b24cd..e86b9f238 100644
--- a/wger/exercises/admin.py
+++ b/wger/exercises/admin.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib import admin
# wger
diff --git a/wger/exercises/api/views.py b/wger/exercises/api/views.py
index 980841aa7..e270a43df 100644
--- a/wger/exercises/api/views.py
+++ b/wger/exercises/api/views.py
@@ -15,8 +15,10 @@
# 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/>.
-# Third Party
+# Django
from django.utils.translation import ugettext as _
+
+# Third Party
from easy_thumbnails.alias import aliases
from easy_thumbnails.files import get_thumbnailer
from rest_framework import viewsets
diff --git a/wger/exercises/apps.py b/wger/exercises/apps.py
index bd2ef6da7..7604dac84 100644
--- a/wger/exercises/apps.py
+++ b/wger/exercises/apps.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.apps import AppConfig
diff --git a/wger/exercises/forms.py b/wger/exercises/forms.py
index 4229856dd..180847eea 100644
--- a/wger/exercises/forms.py
+++ b/wger/exercises/forms.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django import forms
# wger
diff --git a/wger/exercises/management/commands/download-exercise-images.py b/wger/exercises/management/commands/download-exercise-images.py
index 5488fbfa9..373476d04 100644
--- a/wger/exercises/management/commands/download-exercise-images.py
+++ b/wger/exercises/management/commands/download-exercise-images.py
@@ -17,8 +17,7 @@
# Standard Library
import os
-# Third Party
-import requests
+# Django
from django.conf import settings
from django.core.exceptions import (
ImproperlyConfigured,
@@ -31,6 +30,9 @@ from django.core.management.base import (
CommandError
)
from django.core.validators import URLValidator
+
+# Third Party
+import requests
from requests.utils import default_user_agent
# wger
diff --git a/wger/exercises/management/commands/redo-capitalize-names.py b/wger/exercises/management/commands/redo-capitalize-names.py
index 8dbdcaa95..224c8ab75 100644
--- a/wger/exercises/management/commands/redo-capitalize-names.py
+++ b/wger/exercises/management/commands/redo-capitalize-names.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core.management.base import BaseCommand
# wger
diff --git a/wger/exercises/management/commands/submitted-exercises.py b/wger/exercises/management/commands/submitted-exercises.py
index 480991efb..8b3b29a34 100644
--- a/wger/exercises/management/commands/submitted-exercises.py
+++ b/wger/exercises/management/commands/submitted-exercises.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core.management.base import BaseCommand
# wger
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 5321f41ec..51c4c9b8a 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -19,21 +19,23 @@
import logging
import uuid
-# Third Party
-import bleach
+# Django
from django.conf import settings
from django.contrib.auth.models import User
from django.contrib.sites.models import Site
from django.core import mail
from django.core.cache import cache
-from django.urls import reverse
from django.core.validators import MinLengthValidator
from django.db import models
from django.template.loader import render_to_string
+from django.urls import reverse
from django.utils import translation
from django.utils.text import slugify
from django.utils.translation import ugettext_lazy as _
+# Third Party
+import bleach
+
# wger
from wger.core.models import Language
from wger.utils.cache import (
diff --git a/wger/exercises/signals.py b/wger/exercises/signals.py
index 3c0d13ce3..dd0b6673e 100644
--- a/wger/exercises/signals.py
+++ b/wger/exercises/signals.py
@@ -15,12 +15,14 @@
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.db.models.signals import (
post_delete,
pre_save
)
from django.dispatch import receiver
+
+# Third Party
from easy_thumbnails.files import get_thumbnailer
from easy_thumbnails.signal_handlers import generate_aliases
from easy_thumbnails.signals import saved_file
diff --git a/wger/exercises/sitemap.py b/wger/exercises/sitemap.py
index a09e4a3d1..a19f8bc4f 100644
--- a/wger/exercises/sitemap.py
+++ b/wger/exercises/sitemap.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib.sitemaps import Sitemap
# wger
diff --git a/wger/exercises/tests/test_categories.py b/wger/exercises/tests/test_categories.py
index c94dc3903..f1891d8bd 100644
--- a/wger/exercises/tests/test_categories.py
+++ b/wger/exercises/tests/test_categories.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core.cache import cache
from django.urls import reverse
diff --git a/wger/exercises/tests/test_corrected_exercise.py b/wger/exercises/tests/test_corrected_exercise.py
index 98f9daf80..5c2923f65 100644
--- a/wger/exercises/tests/test_corrected_exercise.py
+++ b/wger/exercises/tests/test_corrected_exercise.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core import mail
from django.urls import reverse
diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.py
index 15681fbb6..8dfa2c2fb 100644
--- a/wger/exercises/tests/test_equipment.py
+++ b/wger/exercises/tests/test_equipment.py
@@ -13,7 +13,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/>.
-# Third Party
+# Django
from django.core.cache import cache
from django.urls import reverse
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index a9f0ce236..be824602d 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -15,7 +15,7 @@
# Standard Library
import json
-# Third Party
+# Django
from django.core import mail
from django.core.cache import cache
from django.urls import reverse
diff --git a/wger/exercises/tests/test_exercise_comments.py b/wger/exercises/tests/test_exercise_comments.py
index 43039f47e..a96dd18c8 100644
--- a/wger/exercises/tests/test_exercise_comments.py
+++ b/wger/exercises/tests/test_exercise_comments.py
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core.cache import cache
from django.urls import reverse
diff --git a/wger/exercises/tests/test_exercise_images.py b/wger/exercises/tests/test_exercise_images.py
index 20fdc9d08..5b481c7f9 100644
--- a/wger/exercises/tests/test_exercise_images.py
+++ b/wger/exercises/tests/test_exercise_images.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core.files import File
from django.urls import reverse
diff --git a/wger/exercises/tests/test_muscles.py b/wger/exercises/tests/test_muscles.py
index 354ec3920..d6a4b6198 100644
--- a/wger/exercises/tests/test_muscles.py
+++ b/wger/exercises/tests/test_muscles.py
@@ -13,7 +13,7 @@
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core.cache import cache
from django.urls import reverse
diff --git a/wger/exercises/tests/test_submitted_exercise.py b/wger/exercises/tests/test_submitted_exercise.py
index cf3f0ecd9..f650ff913 100644
--- a/wger/exercises/tests/test_submitted_exercise.py
+++ b/wger/exercises/tests/test_submitted_exercise.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core import mail
from django.urls import reverse
diff --git a/wger/exercises/tests/test_submitted_image.py b/wger/exercises/tests/test_submitted_image.py
index bb796ed9a..53eb568e5 100644
--- a/wger/exercises/tests/test_submitted_image.py
+++ b/wger/exercises/tests/test_submitted_image.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core import mail
from django.urls import reverse
diff --git a/wger/exercises/urls.py b/wger/exercises/urls.py
index 7d0dfff98..699f21072 100644
--- a/wger/exercises/urls.py
+++ b/wger/exercises/urls.py
@@ -15,7 +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/>.
-# Third Party
+# Django
from django.conf.urls import (
include,
url
diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.py
index 65f4d8aa4..ecebd051b 100644
--- a/wger/exercises/views/categories.py
+++ b/wger/exercises/views/categories.py
@@ -17,7 +17,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
@@ -40,9 +40,9 @@ from django.views.generic import (
# wger
from wger.exercises.models import ExerciseCategory
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
from wger.utils.language import load_language
diff --git a/wger/exercises/views/comments.py b/wger/exercises/views/comments.py
index a816bef35..b66d5261c 100644
--- a/wger/exercises/views/comments.py
+++ b/wger/exercises/views/comments.py
@@ -17,15 +17,15 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
-from django.urls import reverse
from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404
+from django.urls import reverse
from django.utils.translation import ugettext_lazy
from django.views.generic import (
CreateView,
diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.py
index 0ccc7b88d..aff554757 100644
--- a/wger/exercises/views/equipment.py
+++ b/wger/exercises/views/equipment.py
@@ -17,7 +17,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
@@ -42,9 +42,9 @@ from wger.config.models import LanguageConfig
from wger.exercises.models import Equipment
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
from wger.utils.language import load_item_languages
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 17f126883..4ab5fbc70 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -17,20 +17,16 @@
import logging
import uuid
-# Third Party
+# Django
+from django.conf import settings
from django.contrib import messages
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
-from django.conf import settings
from django.core import mail
from django.core.cache import cache
-from django.urls import (
- reverse,
- reverse_lazy
-)
from django.forms import (
ModelChoiceField,
ModelForm,
@@ -42,6 +38,11 @@ from django.http import (
)
from django.shortcuts import get_object_or_404
from django.template.loader import render_to_string
+from django.urls import (
+ reverse,
+ reverse_lazy
+)
+from django.utils.cache import patch_vary_headers
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -52,7 +53,6 @@ from django.views.generic import (
ListView,
UpdateView
)
-from django.utils.cache import patch_vary_headers
# wger
from wger.config.models import LanguageConfig
@@ -64,10 +64,11 @@ from wger.exercises.models import (
from wger.manager.models import WorkoutLog
from wger.utils.cache import cache_mapper
from wger.utils.generic_views import (
- WgerDeleteMixin,
- WgerFormMixin,
UAAwareViewMixin,
+ WgerDeleteMixin,
+ WgerFormMixin
)
+from wger.utils.helpers import ua_aware_render
from wger.utils.language import (
load_item_languages,
load_language
@@ -78,7 +79,7 @@ from wger.utils.widgets import (
TranslatedSelectMultiple
)
from wger.weight.helpers import process_log_entries
-from wger.utils.helpers import ua_aware_render
+
logger = logging.getLogger(__name__)
diff --git a/wger/exercises/views/images.py b/wger/exercises/views/images.py
index 5a7aeb5b0..d7bdcc6a9 100644
--- a/wger/exercises/views/images.py
+++ b/wger/exercises/views/images.py
@@ -17,15 +17,15 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
-from django.urls import reverse
from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404
+from django.urls import reverse
from django.utils.translation import (
ugettext as _,
ugettext_lazy
diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.py
index 0af94eb7c..879e5aea1 100644
--- a/wger/exercises/views/muscles.py
+++ b/wger/exercises/views/muscles.py
@@ -17,7 +17,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
@@ -41,9 +41,9 @@ from django.views.generic import (
from wger.config.models import LanguageConfig
from wger.exercises.models import Muscle
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
from wger.utils.language import load_item_languages
diff --git a/wger/gym/__init__.py b/wger/gym/__init__.py
index 48d808608..869912bd4 100644
--- a/wger/gym/__init__.py
+++ b/wger/gym/__init__.py
@@ -15,7 +15,9 @@
# 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/>.
+# wger
from wger import get_version
+
VERSION = get_version()
default_app_config = 'wger.gym.apps.GymConfig'
diff --git a/wger/gym/apps.py b/wger/gym/apps.py
index 705c949cb..dd6a783a5 100644
--- a/wger/gym/apps.py
+++ b/wger/gym/apps.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.apps import AppConfig
diff --git a/wger/gym/forms.py b/wger/gym/forms.py
index c4010ae9b..196786392 100644
--- a/wger/gym/forms.py
+++ b/wger/gym/forms.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django import forms
from django.contrib.auth.models import User
from django.utils.translation import ugettext as _
diff --git a/wger/gym/management/commands/gym-user-config.py b/wger/gym/management/commands/gym-user-config.py
index 2af1ddbd9..05ffc3e24 100644
--- a/wger/gym/management/commands/gym-user-config.py
+++ b/wger/gym/management/commands/gym-user-config.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.core.exceptions import ObjectDoesNotExist
from django.core.management.base import BaseCommand
diff --git a/wger/gym/management/commands/inactive-members.py b/wger/gym/management/commands/inactive-members.py
index 51898bab8..f6303a77f 100644
--- a/wger/gym/management/commands/inactive-members.py
+++ b/wger/gym/management/commands/inactive-members.py
@@ -17,7 +17,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.conf import settings
from django.core import mail
from django.core.management.base import BaseCommand
diff --git a/wger/gym/managers.py b/wger/gym/managers.py
index f531b3082..8caf3996f 100644
--- a/wger/gym/managers.py
+++ b/wger/gym/managers.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib.auth.models import (
Permission,
User
diff --git a/wger/gym/models.py b/wger/gym/models.py
index 715a323f4..fdb96891f 100644
--- a/wger/gym/models.py
+++ b/wger/gym/models.py
@@ -18,10 +18,10 @@
import datetime
import uuid
-# Third Party
+# Django
from django.contrib.auth.models import User
-from django.urls import reverse
from django.db import models as m
+from django.urls import reverse
from django.utils.translation import (
ugettext,
ugettext_lazy as _
diff --git a/wger/gym/signals.py b/wger/gym/signals.py
index c51dbb30c..f51c0389b 100644
--- a/wger/gym/signals.py
+++ b/wger/gym/signals.py
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.db.models.signals import (
post_delete,
post_save
diff --git a/wger/gym/tests/test_admin_user_notes.py b/wger/gym/tests/test_admin_user_notes.py
index 90ae28fa9..27e8fb45f 100644
--- a/wger/gym/tests/test_admin_user_notes.py
+++ b/wger/gym/tests/test_admin_user_notes.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.urls import reverse_lazy
# wger
diff --git a/wger/gym/tests/test_contract_options.py b/wger/gym/tests/test_contract_options.py
index 257c24bde..0c1f05472 100644
--- a/wger/gym/tests/test_contract_options.py
+++ b/wger/gym/tests/test_contract_options.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/gym/tests/test_contract_types.py b/wger/gym/tests/test_contract_types.py
index 484088a4a..ca1bf6a05 100644
--- a/wger/gym/tests/test_contract_types.py
+++ b/wger/gym/tests/test_contract_types.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/gym/tests/test_contracts.py b/wger/gym/tests/test_contracts.py
index c039872dd..216cc76c9 100644
--- a/wger/gym/tests/test_contracts.py
+++ b/wger/gym/tests/test_contracts.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/gym/tests/test_export.py b/wger/gym/tests/test_export.py
index 11b50586d..4768b7159 100644
--- a/wger/gym/tests/test_export.py
+++ b/wger/gym/tests/test_export.py
@@ -15,7 +15,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/gym/tests/test_gym.py b/wger/gym/tests/test_gym.py
index 8e6bf13ee..2e14d364f 100644
--- a/wger/gym/tests/test_gym.py
+++ b/wger/gym/tests/test_gym.py
@@ -13,7 +13,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/>.
-# Third Party
+# Django
from django.urls import reverse_lazy
# wger
diff --git a/wger/gym/tests/test_inactive_members.py b/wger/gym/tests/test_inactive_members.py
index c40212aac..538d7b006 100644
--- a/wger/gym/tests/test_inactive_members.py
+++ b/wger/gym/tests/test_inactive_members.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core import mail
from django.core.management import call_command
diff --git a/wger/gym/tests/test_user.py b/wger/gym/tests/test_user.py
index def324db5..7191f2343 100644
--- a/wger/gym/tests/test_user.py
+++ b/wger/gym/tests/test_user.py
@@ -15,7 +15,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.contrib.auth.models import (
Permission,
User
diff --git a/wger/gym/tests/test_user_documents.py b/wger/gym/tests/test_user_documents.py
index 77e0a254b..992f9dea6 100644
--- a/wger/gym/tests/test_user_documents.py
+++ b/wger/gym/tests/test_user_documents.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/gym/tests/test_user_last_activity.py b/wger/gym/tests/test_user_last_activity.py
index 4bcf1e058..c142cbafa 100644
--- a/wger/gym/tests/test_user_last_activity.py
+++ b/wger/gym/tests/test_user_last_activity.py
@@ -15,7 +15,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.contrib.auth.models import User
# wger
diff --git a/wger/gym/urls.py b/wger/gym/urls.py
index 9cc3dc696..2c5d315fb 100644
--- a/wger/gym/urls.py
+++ b/wger/gym/urls.py
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.conf.urls import (
include,
url
diff --git a/wger/gym/views/admin_config.py b/wger/gym/views/admin_config.py
index 578e39918..795880ba0 100644
--- a/wger/gym/views/admin_config.py
+++ b/wger/gym/views/admin_config.py
@@ -17,7 +17,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.urls import reverse
from django.utils.translation import ugettext as _
from django.views.generic import UpdateView
diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.py
index 8da74496a..57544a376 100644
--- a/wger/gym/views/admin_notes.py
+++ b/wger/gym/views/admin_notes.py
@@ -17,14 +17,14 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
from django.contrib.auth.models import User
-from django.urls import reverse
from django.http.response import HttpResponseForbidden
+from django.urls import reverse
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -39,9 +39,9 @@ from django.views.generic import (
# wger
from wger.gym.models import AdminUserNote
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
diff --git a/wger/gym/views/config.py b/wger/gym/views/config.py
index 6fd60a8c0..14d73862f 100644
--- a/wger/gym/views/config.py
+++ b/wger/gym/views/config.py
@@ -17,13 +17,13 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
-from django.urls import reverse
from django.http.response import HttpResponseForbidden
+from django.urls import reverse
from django.utils.translation import ugettext as _
from django.views.generic import UpdateView
diff --git a/wger/gym/views/contract.py b/wger/gym/views/contract.py
index 36a666ccc..8e1ed7f00 100644
--- a/wger/gym/views/contract.py
+++ b/wger/gym/views/contract.py
@@ -17,15 +17,15 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
from django.contrib.auth.models import User
-from django.urls import reverse
from django.http.response import HttpResponseForbidden
from django.shortcuts import get_object_or_404
+from django.urls import reverse
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -40,8 +40,8 @@ from django.views.generic import (
# wger
from wger.gym.models import Contract
from wger.utils.generic_views import (
- WgerFormMixin,
- UAAwareViewMixin
+ UAAwareViewMixin,
+ WgerFormMixin
)
diff --git a/wger/gym/views/contract_option.py b/wger/gym/views/contract_option.py
index 83772a9f8..772dedd81 100644
--- a/wger/gym/views/contract_option.py
+++ b/wger/gym/views/contract_option.py
@@ -17,14 +17,14 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
-from django.urls import reverse
from django.http.response import HttpResponseForbidden
from django.shortcuts import get_object_or_404
+from django.urls import reverse
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -42,9 +42,9 @@ from wger.gym.models import (
Gym
)
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
diff --git a/wger/gym/views/contract_type.py b/wger/gym/views/contract_type.py
index eaccc60c6..ee89a947e 100644
--- a/wger/gym/views/contract_type.py
+++ b/wger/gym/views/contract_type.py
@@ -17,14 +17,14 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
-from django.urls import reverse
from django.http.response import HttpResponseForbidden
from django.shortcuts import get_object_or_404
+from django.urls import reverse
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -42,9 +42,9 @@ from wger.gym.models import (
Gym
)
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
diff --git a/wger/gym/views/document.py b/wger/gym/views/document.py
index 4b9dd1372..aa8ef60a7 100644
--- a/wger/gym/views/document.py
+++ b/wger/gym/views/document.py
@@ -17,14 +17,14 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
from django.contrib.auth.models import User
-from django.urls import reverse
from django.http.response import HttpResponseForbidden
+from django.urls import reverse
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -39,9 +39,9 @@ from django.views.generic import (
# wger
from wger.gym.models import UserDocument
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
diff --git a/wger/gym/views/export.py b/wger/gym/views/export.py
index 404269bbd..55165050b 100644
--- a/wger/gym/views/export.py
+++ b/wger/gym/views/export.py
@@ -19,7 +19,7 @@ import csv
import datetime
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import login_required
from django.http.response import (
HttpResponse,
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 01d885213..97cf80c44 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -20,7 +20,7 @@ import csv
import datetime
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import (
LoginRequiredMixin,
@@ -30,16 +30,16 @@ from django.contrib.auth.models import (
Group,
User
)
-from django.urls import (
- reverse,
- reverse_lazy
-)
from django.http.response import (
HttpResponse,
HttpResponseForbidden,
HttpResponseRedirect
)
from django.shortcuts import get_object_or_404
+from django.urls import (
+ reverse,
+ reverse_lazy
+)
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -67,16 +67,17 @@ from wger.gym.models import (
GymUserConfig
)
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
WgerFormMixin,
- WgerMultiplePermissionRequiredMixin,
- UAAwareViewMixin
+ WgerMultiplePermissionRequiredMixin
)
from wger.utils.helpers import (
password_generator,
ua_aware_render
)
+
logger = logging.getLogger(__name__)
diff --git a/wger/gym/views/user_config.py b/wger/gym/views/user_config.py
index fdb8a4ee6..09fdc7bbf 100644
--- a/wger/gym/views/user_config.py
+++ b/wger/gym/views/user_config.py
@@ -17,13 +17,13 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
-from django.urls import reverse
from django.http import HttpResponseForbidden
+from django.urls import reverse
from django.utils.translation import ugettext as _
from django.views.generic import UpdateView
diff --git a/wger/manager/__init__.py b/wger/manager/__init__.py
index e83a37b58..aa1e7304c 100644
--- a/wger/manager/__init__.py
+++ b/wger/manager/__init__.py
@@ -16,7 +16,9 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+# wger
from wger import get_version
+
VERSION = get_version()
default_app_config = 'wger.manager.apps.ManagerConfig'
diff --git a/wger/manager/admin.py b/wger/manager/admin.py
index 8b6065b10..b31c485f6 100644
--- a/wger/manager/admin.py
+++ b/wger/manager/admin.py
@@ -13,7 +13,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib import admin
# wger
diff --git a/wger/manager/apps.py b/wger/manager/apps.py
index bebac364f..863d5e805 100644
--- a/wger/manager/apps.py
+++ b/wger/manager/apps.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.apps import AppConfig
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index 0bf01309f..d6544af06 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -18,8 +18,7 @@
This file contains forms used in the application
'''
-# Third Party
-from captcha.fields import ReCaptchaField
+# Django
from django.forms import (
CharField,
DateField,
@@ -33,6 +32,9 @@ from django.forms import (
)
from django.utils.translation import ugettext as _
+# Third Party
+from captcha.fields import ReCaptchaField
+
# wger
from wger.core.models import (
RepetitionUnit,
diff --git a/wger/manager/helpers.py b/wger/manager/helpers.py
index 002e62022..f275a39d6 100644
--- a/wger/manager/helpers.py
+++ b/wger/manager/helpers.py
@@ -19,9 +19,11 @@
import datetime
from calendar import HTMLCalendar
-# Third Party
+# Django
from django.urls import reverse
from django.utils.translation import ugettext as _
+
+# Third Party
from reportlab.lib import colors
from reportlab.lib.units import cm
from reportlab.platypus import (
diff --git a/wger/manager/management/commands/email-reminders.py b/wger/manager/management/commands/email-reminders.py
index aee8887df..120149ac5 100644
--- a/wger/manager/management/commands/email-reminders.py
+++ b/wger/manager/management/commands/email-reminders.py
@@ -17,7 +17,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.conf import settings
from django.contrib.sites.models import Site
from django.core import mail
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 9b011518b..a1e0408ae 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -19,20 +19,22 @@
import datetime
import logging
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.core.cache import cache
from django.core.exceptions import (
ObjectDoesNotExist,
ValidationError
)
-from django.urls import reverse
from django.core.validators import (
MaxValueValidator,
MinValueValidator
)
from django.db import models
+from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
+
+# Third Party
from sortedm2m.fields import SortedManyToManyField
# wger
diff --git a/wger/manager/signals.py b/wger/manager/signals.py
index 2a6649c08..0a27c10c9 100644
--- a/wger/manager/signals.py
+++ b/wger/manager/signals.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.db.models import Q
from django.db.models.signals import (
post_save,
diff --git a/wger/manager/tests/__init__.py b/wger/manager/tests/__init__.py
index a915bb265..46a91e9bd 100644
--- a/wger/manager/tests/__init__.py
+++ b/wger/manager/tests/__init__.py
@@ -16,6 +16,8 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+# wger
from wger import get_version
+
VERSION = get_version()
diff --git a/wger/manager/tests/test_copy_workout.py b/wger/manager/tests/test_copy_workout.py
index 9c19de5ab..1859d7c4d 100644
--- a/wger/manager/tests/test_copy_workout.py
+++ b/wger/manager/tests/test_copy_workout.py
@@ -15,7 +15,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/manager/tests/test_day.py b/wger/manager/tests/test_day.py
index 23c9a3606..4425dcd92 100644
--- a/wger/manager/tests/test_day.py
+++ b/wger/manager/tests/test_day.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core.cache import cache
from django.urls import reverse
diff --git a/wger/manager/tests/test_email_reminder.py b/wger/manager/tests/test_email_reminder.py
index 015784bdc..94b2b31f9 100644
--- a/wger/manager/tests/test_email_reminder.py
+++ b/wger/manager/tests/test_email_reminder.py
@@ -15,7 +15,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.core import mail
from django.core.management import call_command
diff --git a/wger/manager/tests/test_ical.py b/wger/manager/tests/test_ical.py
index ef8095955..21b49c04f 100644
--- a/wger/manager/tests/test_ical.py
+++ b/wger/manager/tests/test_ical.py
@@ -15,7 +15,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/manager/tests/test_pdf.py b/wger/manager/tests/test_pdf.py
index 6a4208965..aec560e97 100644
--- a/wger/manager/tests/test_pdf.py
+++ b/wger/manager/tests/test_pdf.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/manager/tests/test_schedule.py b/wger/manager/tests/test_schedule.py
index ea847a4f6..0c88cefce 100644
--- a/wger/manager/tests/test_schedule.py
+++ b/wger/manager/tests/test_schedule.py
@@ -16,7 +16,7 @@
import datetime
import logging
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/manager/tests/test_schedule_step.py b/wger/manager/tests/test_schedule_step.py
index 972ae5e70..c2d8681a4 100644
--- a/wger/manager/tests/test_schedule_step.py
+++ b/wger/manager/tests/test_schedule_step.py
@@ -15,7 +15,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.urls import reverse_lazy
# wger
diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.py
index 5a82e20ac..24e3dcebd 100644
--- a/wger/manager/tests/test_set.py
+++ b/wger/manager/tests/test_set.py
@@ -15,7 +15,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.core.cache import cache
from django.urls import (
reverse,
diff --git a/wger/manager/tests/test_timer.py b/wger/manager/tests/test_timer.py
index 5360d4939..5ec183cbb 100644
--- a/wger/manager/tests/test_timer.py
+++ b/wger/manager/tests/test_timer.py
@@ -18,7 +18,7 @@ import logging
import math
from decimal import Decimal
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 0558dd9dc..48e712b99 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -16,7 +16,7 @@
import datetime
import logging
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.core.cache import cache
from django.urls import (
diff --git a/wger/manager/tests/test_workout.py b/wger/manager/tests/test_workout.py
index 80d9dfdec..37d024d18 100644
--- a/wger/manager/tests/test_workout.py
+++ b/wger/manager/tests/test_workout.py
@@ -15,7 +15,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.py
index 4259dbe83..2fda71402 100644
--- a/wger/manager/tests/test_workout_canonical.py
+++ b/wger/manager/tests/test_workout_canonical.py
@@ -15,7 +15,7 @@
# Standard Library
from decimal import Decimal
-# Third Party
+# Django
from django.core.cache import cache
# wger
diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.py
index cb9615071..d0f5b7d64 100644
--- a/wger/manager/tests/test_workout_session.py
+++ b/wger/manager/tests/test_workout_session.py
@@ -15,7 +15,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.core.cache import cache
from django.core.exceptions import ValidationError
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 19b4a9242..3245fab66 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -15,7 +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/>.
-# Third Party
+# Django
from django.conf.urls import (
include,
url
diff --git a/wger/manager/views/day.py b/wger/manager/views/day.py
index e941659ee..032ca9725 100644
--- a/wger/manager/views/day.py
+++ b/wger/manager/views/day.py
@@ -17,12 +17,12 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
-from django.urls import reverse
from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404
+from django.urls import reverse
from django.utils.translation import (
ugettext as _,
ugettext_lazy
diff --git a/wger/manager/views/ical.py b/wger/manager/views/ical.py
index 53d0329e5..81589af53 100644
--- a/wger/manager/views/ical.py
+++ b/wger/manager/views/ical.py
@@ -18,13 +18,15 @@
import datetime
import logging
-# Third Party
+# Django
from django.contrib.sites.models import Site
from django.http import (
HttpResponse,
HttpResponseForbidden
)
from django.shortcuts import get_object_or_404
+
+# Third Party
from icalendar import (
Calendar,
Event
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 57b34cdf9..eef181f05 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -19,12 +19,8 @@ import datetime
import logging
import uuid
-# Third Party
+# Django
from django.contrib.auth.mixins import LoginRequiredMixin
-from django.urls import (
- reverse,
- reverse_lazy
-)
from django.forms.models import modelformset_factory
from django.http import (
HttpResponseForbidden,
@@ -32,6 +28,10 @@ from django.http import (
)
from django.shortcuts import get_object_or_404
from django.template.context_processors import csrf
+from django.urls import (
+ reverse,
+ reverse_lazy
+)
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -49,7 +49,6 @@ from wger.manager.forms import (
WorkoutLogForm
)
from wger.manager.helpers import WorkoutCalendar
-from wger.utils.helpers import ua_aware_render
from wger.manager.models import (
Day,
Schedule,
@@ -61,7 +60,10 @@ from wger.utils.generic_views import (
WgerDeleteMixin,
WgerFormMixin
)
-from wger.utils.helpers import check_access
+from wger.utils.helpers import (
+ check_access,
+ ua_aware_render
+)
from wger.weight.helpers import (
group_log_entries,
process_log_entries
diff --git a/wger/manager/views/pdf.py b/wger/manager/views/pdf.py
index 6e8504ec2..5a5a6f828 100644
--- a/wger/manager/views/pdf.py
+++ b/wger/manager/views/pdf.py
@@ -17,15 +17,17 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.http import (
HttpResponse,
HttpResponseForbidden
)
from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext as _
-from reportlab.lib.units import cm
+
+# Third Party
from reportlab.lib.pagesizes import A4
+from reportlab.lib.units import cm
from reportlab.platypus import (
Paragraph,
SimpleDocTemplate,
diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py
index b2f12aaa9..82394ed29 100644
--- a/wger/manager/views/schedule.py
+++ b/wger/manager/views/schedule.py
@@ -18,28 +18,31 @@
import datetime
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.urls import (
- reverse,
- reverse_lazy
-)
from django.http import (
HttpResponse,
HttpResponseForbidden,
HttpResponseRedirect
)
from django.shortcuts import get_object_or_404
+from django.urls import (
+ reverse,
+ reverse_lazy
+)
from django.utils.translation import (
ugettext as _,
ugettext_lazy
)
+from django.views.decorators.vary import vary_on_headers
from django.views.generic import (
CreateView,
DeleteView,
UpdateView
)
+
+# Third Party
from reportlab.lib.pagesizes import A4
from reportlab.lib.units import cm
from reportlab.platypus import (
@@ -47,7 +50,6 @@ from reportlab.platypus import (
SimpleDocTemplate,
Spacer
)
-from django.views.decorators.vary import vary_on_headers
# wger
from wger.manager.helpers import render_workout_day
diff --git a/wger/manager/views/schedule_step.py b/wger/manager/views/schedule_step.py
index 926b926fc..9aacb709c 100644
--- a/wger/manager/views/schedule_step.py
+++ b/wger/manager/views/schedule_step.py
@@ -17,14 +17,14 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.urls import reverse
from django.db import models
from django.forms import (
ModelChoiceField,
ModelForm
)
+from django.urls import reverse
from django.utils.translation import (
ugettext as _,
ugettext_lazy
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index d0bcdc129..b4d3b0cd9 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -17,10 +17,9 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import login_required
from django.core.exceptions import ObjectDoesNotExist
-from django.urls import reverse
from django.db import models
from django.forms.models import (
inlineformset_factory,
@@ -31,6 +30,9 @@ from django.http import (
HttpResponseRedirect
)
from django.shortcuts import get_object_or_404
+from django.urls import reverse
+
+# Third Party
from django_user_agents.utils import get_user_agent
# wger
@@ -46,8 +48,8 @@ from wger.manager.models import (
Set,
Setting
)
-from wger.utils.language import load_item_languages
from wger.utils.helpers import ua_aware_render
+from wger.utils.language import load_item_languages
logger = logging.getLogger(__name__)
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index ba06edc86..5e721e3f0 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -19,28 +19,28 @@ import datetime
import logging
import uuid
-# Third Party
+# Django
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
-from django.urls import (
- reverse,
- reverse_lazy
-)
from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
from django.shortcuts import get_object_or_404
from django.template.context_processors import csrf
+from django.urls import (
+ reverse,
+ reverse_lazy
+)
from django.utils.translation import (
ugettext as _,
ugettext_lazy
)
+from django.views.decorators.vary import vary_on_headers
from django.views.generic import (
DeleteView,
UpdateView
)
-from django.views.decorators.vary import vary_on_headers
# wger
from wger.core.models import (
diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.py
index 544fcba0b..c7df24f95 100644
--- a/wger/manager/views/workout_session.py
+++ b/wger/manager/views/workout_session.py
@@ -18,16 +18,16 @@
import datetime
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import LoginRequiredMixin
-from django.urls import (
- reverse,
- reverse_lazy
-)
from django.http import (
HttpResponseBadRequest,
HttpResponseForbidden
)
+from django.urls import (
+ reverse,
+ reverse_lazy
+)
from django.utils.translation import (
ugettext as _,
ugettext_lazy
diff --git a/wger/nutrition/__init__.py b/wger/nutrition/__init__.py
index a915bb265..46a91e9bd 100644
--- a/wger/nutrition/__init__.py
+++ b/wger/nutrition/__init__.py
@@ -16,6 +16,8 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+# wger
from wger import get_version
+
VERSION = get_version()
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index 36603b2de..3f9744395 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -17,7 +17,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django import forms
from django.utils.translation import ugettext as _
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index bee7f3f6d..e00e800ab 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -20,14 +20,13 @@ import logging
#
from decimal import Decimal
-# Third Party
+# Django
from django.conf import settings
from django.contrib.auth.models import User
from django.contrib.sites.models import Site
from django.core import mail
from django.core.cache import cache
from django.core.exceptions import ValidationError
-from django.urls import reverse
from django.core.validators import (
MaxValueValidator,
MinValueValidator
@@ -35,6 +34,7 @@ from django.core.validators import (
from django.db import models
from django.template.defaultfilters import slugify # django.utils.text.slugify in django 1.5!
from django.template.loader import render_to_string
+from django.urls import reverse
from django.utils import translation
from django.utils.translation import ugettext_lazy as _
diff --git a/wger/nutrition/sitemap.py b/wger/nutrition/sitemap.py
index dd0337a6d..b75dbfaf1 100644
--- a/wger/nutrition/sitemap.py
+++ b/wger/nutrition/sitemap.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib.sitemaps import Sitemap
# wger
diff --git a/wger/nutrition/tests/test_bmi.py b/wger/nutrition/tests/test_bmi.py
index 96fbbd57d..5bef4e855 100644
--- a/wger/nutrition/tests/test_bmi.py
+++ b/wger/nutrition/tests/test_bmi.py
@@ -17,7 +17,7 @@ import datetime
import json
from decimal import Decimal
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/nutrition/tests/test_calories_calculator.py b/wger/nutrition/tests/test_calories_calculator.py
index 01787401d..177bd9ab9 100644
--- a/wger/nutrition/tests/test_calories_calculator.py
+++ b/wger/nutrition/tests/test_calories_calculator.py
@@ -17,7 +17,7 @@ import datetime
import decimal
import json
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/nutrition/tests/test_copy_plan.py b/wger/nutrition/tests/test_copy_plan.py
index 84e8963d5..61526bb5b 100644
--- a/wger/nutrition/tests/test_copy_plan.py
+++ b/wger/nutrition/tests/test_copy_plan.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.py
index 95a8cf315..d8533ab96 100644
--- a/wger/nutrition/tests/test_ingredient.py
+++ b/wger/nutrition/tests/test_ingredient.py
@@ -18,7 +18,7 @@ import datetime
import json
from decimal import Decimal
-# Third Party
+# Django
from django.core.exceptions import ValidationError
from django.urls import reverse
diff --git a/wger/nutrition/tests/test_ingredient_overview.py b/wger/nutrition/tests/test_ingredient_overview.py
index a1b3f2e1a..3d8f50d25 100644
--- a/wger/nutrition/tests/test_ingredient_overview.py
+++ b/wger/nutrition/tests/test_ingredient_overview.py
@@ -13,7 +13,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/>.
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/nutrition/tests/test_meal.py b/wger/nutrition/tests/test_meal.py
index d42342011..b3e76a069 100644
--- a/wger/nutrition/tests/test_meal.py
+++ b/wger/nutrition/tests/test_meal.py
@@ -16,7 +16,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/nutrition/tests/test_meal_item.py b/wger/nutrition/tests/test_meal_item.py
index 0581434d8..22591070d 100644
--- a/wger/nutrition/tests/test_meal_item.py
+++ b/wger/nutrition/tests/test_meal_item.py
@@ -13,7 +13,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/>.
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/nutrition/tests/test_pdf.py b/wger/nutrition/tests/test_pdf.py
index e6c4b80cd..7ba6b94b8 100644
--- a/wger/nutrition/tests/test_pdf.py
+++ b/wger/nutrition/tests/test_pdf.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.urls import reverse
diff --git a/wger/nutrition/tests/test_plan.py b/wger/nutrition/tests/test_plan.py
index 3d0935a29..be8da225e 100644
--- a/wger/nutrition/tests/test_plan.py
+++ b/wger/nutrition/tests/test_plan.py
@@ -13,7 +13,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/>.
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/nutrition/tests/test_submitted_ingredient.py b/wger/nutrition/tests/test_submitted_ingredient.py
index 7019b98d8..602c02893 100644
--- a/wger/nutrition/tests/test_submitted_ingredient.py
+++ b/wger/nutrition/tests/test_submitted_ingredient.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.core import mail
from django.urls import reverse
diff --git a/wger/nutrition/tests/test_weight_unit.py b/wger/nutrition/tests/test_weight_unit.py
index 712c37ddd..73fea69be 100644
--- a/wger/nutrition/tests/test_weight_unit.py
+++ b/wger/nutrition/tests/test_weight_unit.py
@@ -13,7 +13,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/>.
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/nutrition/tests/test_weight_unit_ingredient.py b/wger/nutrition/tests/test_weight_unit_ingredient.py
index 7df30ec10..bd324000e 100644
--- a/wger/nutrition/tests/test_weight_unit_ingredient.py
+++ b/wger/nutrition/tests/test_weight_unit_ingredient.py
@@ -13,7 +13,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/>.
-# Third Party
+# Django
from django.urls import (
reverse,
reverse_lazy
diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.py
index 9357f56ff..9b1823c3a 100644
--- a/wger/nutrition/urls.py
+++ b/wger/nutrition/urls.py
@@ -15,7 +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/>.
-# Third Party
+# Django
from django.conf.urls import (
include,
url
diff --git a/wger/nutrition/views/bmi.py b/wger/nutrition/views/bmi.py
index ca7d2afc2..df05dab20 100644
--- a/wger/nutrition/views/bmi.py
+++ b/wger/nutrition/views/bmi.py
@@ -19,7 +19,7 @@
import json
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import login_required
from django.http import HttpResponse
diff --git a/wger/nutrition/views/calculator.py b/wger/nutrition/views/calculator.py
index 48f4b8e8d..9377eb018 100644
--- a/wger/nutrition/views/calculator.py
+++ b/wger/nutrition/views/calculator.py
@@ -19,7 +19,7 @@
import json
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import login_required
from django.http import HttpResponse
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index b23f8369e..4e2d07f24 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -17,7 +17,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib import messages
from django.contrib.auth.decorators import permission_required
from django.contrib.auth.mixins import (
@@ -25,15 +25,15 @@ from django.contrib.auth.mixins import (
PermissionRequiredMixin
)
from django.core.cache import cache
-from django.urls import (
- reverse,
- reverse_lazy
-)
from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
from django.shortcuts import get_object_or_404
+from django.urls import (
+ reverse,
+ reverse_lazy
+)
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -51,15 +51,15 @@ from wger.nutrition.models import Ingredient
from wger.utils.cache import cache_mapper
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
+from wger.utils.helpers import ua_aware_render
from wger.utils.language import (
load_ingredient_languages,
load_language
)
-from wger.utils.helpers import ua_aware_render
logger = logging.getLogger(__name__)
diff --git a/wger/nutrition/views/meal.py b/wger/nutrition/views/meal.py
index 999f19fc3..0f3fe499c 100644
--- a/wger/nutrition/views/meal.py
+++ b/wger/nutrition/views/meal.py
@@ -17,14 +17,14 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import login_required
-from django.urls import reverse
from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
from django.shortcuts import get_object_or_404
+from django.urls import reverse
from django.utils.translation import ugettext_lazy
from django.views.generic import (
CreateView,
diff --git a/wger/nutrition/views/meal_item.py b/wger/nutrition/views/meal_item.py
index b5e469777..4e2f2da80 100644
--- a/wger/nutrition/views/meal_item.py
+++ b/wger/nutrition/views/meal_item.py
@@ -17,14 +17,14 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import login_required
-from django.urls import reverse
from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
from django.shortcuts import get_object_or_404
+from django.urls import reverse
from django.utils.translation import ugettext_lazy
from django.views.generic import (
CreateView,
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index 099608051..27f19888c 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -18,12 +18,8 @@
import datetime
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import login_required
-from django.urls import (
- reverse,
- reverse_lazy
-)
from django.http import (
HttpResponse,
HttpResponseForbidden,
@@ -31,6 +27,10 @@ from django.http import (
)
from django.shortcuts import get_object_or_404
from django.template.context_processors import csrf
+from django.urls import (
+ reverse,
+ reverse_lazy
+)
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -39,9 +39,11 @@ from django.views.generic import (
DeleteView,
UpdateView
)
+
+# Third Party
from reportlab.lib import colors
-from reportlab.lib.units import cm
from reportlab.lib.pagesizes import A4
+from reportlab.lib.units import cm
from reportlab.platypus import (
Paragraph,
SimpleDocTemplate,
diff --git a/wger/nutrition/views/unit.py b/wger/nutrition/views/unit.py
index 3ba28745a..dc5c93530 100644
--- a/wger/nutrition/views/unit.py
+++ b/wger/nutrition/views/unit.py
@@ -17,7 +17,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
@@ -41,9 +41,9 @@ from django.views.generic import (
from wger.nutrition.models import WeightUnit
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
from wger.utils.generic_views import (
+ UAAwareViewMixin,
WgerDeleteMixin,
- WgerFormMixin,
- UAAwareViewMixin
+ WgerFormMixin
)
from wger.utils.language import load_language
diff --git a/wger/nutrition/views/unit_ingredient.py b/wger/nutrition/views/unit_ingredient.py
index 97a586bda..801daa968 100644
--- a/wger/nutrition/views/unit_ingredient.py
+++ b/wger/nutrition/views/unit_ingredient.py
@@ -17,17 +17,17 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
-from django.urls import reverse
from django.forms import (
ModelChoiceField,
ModelForm
)
from django.shortcuts import get_object_or_404
+from django.urls import reverse
from django.utils.translation import ugettext_lazy
from django.views.generic import (
CreateView,
diff --git a/wger/settings.tpl b/wger/settings.tpl
index 98c292918..b1b875615 100644
--- a/wger/settings.tpl
+++ b/wger/settings.tpl
@@ -1,8 +1,10 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
+# wger
from wger.settings_global import *
+
# Use 'DEBUG = True' to get more details for server errors
DEBUG = True
TEMPLATES[0]['OPTIONS']['debug'] = True
diff --git a/wger/software/__init__.py b/wger/software/__init__.py
index a915bb265..46a91e9bd 100644
--- a/wger/software/__init__.py
+++ b/wger/software/__init__.py
@@ -16,6 +16,8 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+# wger
from wger import get_version
+
VERSION = get_version()
diff --git a/wger/software/urls.py b/wger/software/urls.py
index a86b22854..b2511478a 100644
--- a/wger/software/urls.py
+++ b/wger/software/urls.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.conf.urls import url
from django.views.generic import (
RedirectView,
diff --git a/wger/software/views.py b/wger/software/views.py
index d89365909..15c6c618f 100644
--- a/wger/software/views.py
+++ b/wger/software/views.py
@@ -17,8 +17,10 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.conf import settings
+
+# wger
from wger.utils.helpers import ua_aware_render
diff --git a/wger/tasks.py b/wger/tasks.py
index 7cbf457de..d38bcff3e 100644
--- a/wger/tasks.py
+++ b/wger/tasks.py
@@ -24,13 +24,15 @@ import threading # noqa E402
import time # noqa E402
import webbrowser # noqa E402
-# Third Party
+# Django
import django # noqa E402
from django.core.management import ( # noqa E402
call_command,
execute_from_command_line
)
from django.utils.crypto import get_random_string # noqa E402
+
+# Third Party
from invoke import task # noqa E402
diff --git a/wger/urls.py b/wger/urls.py
index dfcb50f2f..34d1adf78 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -15,7 +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/>.
-# Third Party
+# Django
from django.conf import settings
from django.conf.urls import (
include,
@@ -25,6 +25,8 @@ from django.conf.urls.i18n import i18n_patterns
from django.conf.urls.static import static
from django.contrib import admin
from django.contrib.sitemaps.views import sitemap
+
+# Third Party
from rest_framework import routers
from tastypie.api import Api
diff --git a/wger/utils/__init__.py b/wger/utils/__init__.py
index a915bb265..46a91e9bd 100644
--- a/wger/utils/__init__.py
+++ b/wger/utils/__init__.py
@@ -16,6 +16,8 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+# wger
from wger import get_version
+
VERSION = get_version()
diff --git a/wger/utils/cache.py b/wger/utils/cache.py
index 01b272e27..13b926652 100644
--- a/wger/utils/cache.py
+++ b/wger/utils/cache.py
@@ -16,7 +16,7 @@
import hashlib
import logging
-# Third Party
+# Django
from django.core.cache import cache
from django.utils.encoding import force_bytes
diff --git a/wger/utils/context_processor.py b/wger/utils/context_processor.py
index 5d715a2b4..79e5ab56b 100644
--- a/wger/utils/context_processor.py
+++ b/wger/utils/context_processor.py
@@ -13,7 +13,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/>.
-# Third Party
+# Django
from django.conf import settings
from django.templatetags.static import static
diff --git a/wger/utils/fields.py b/wger/utils/fields.py
index 7f6bbb71d..0a90ebdc0 100644
--- a/wger/utils/fields.py
+++ b/wger/utils/fields.py
@@ -15,7 +15,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.db import models
# wger
diff --git a/wger/utils/generic_views.py b/wger/utils/generic_views.py
index 73a9e2403..13eef4995 100644
--- a/wger/utils/generic_views.py
+++ b/wger/utils/generic_views.py
@@ -17,24 +17,27 @@
# Standard Library
import logging
-# Third Party
-import bleach
+# Django
from django.contrib import messages
from django.contrib.auth.mixins import PermissionRequiredMixin
-from django.urls import (
- reverse,
- reverse_lazy
-)
from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
from django.template.context_processors import csrf
+from django.urls import (
+ reverse,
+ reverse_lazy
+)
from django.utils.translation import ugettext_lazy
from django.views.generic import TemplateView
from django.views.generic.base import View
from django.views.generic.edit import ModelFormMixin
+# Third Party
+import bleach
+from django_user_agents.utils import get_user_agent
+
# wger
from wger.utils.constants import (
HTML_ATTRIBUTES_WHITELIST,
@@ -42,7 +45,6 @@ from wger.utils.constants import (
HTML_TAG_WHITELIST
)
-from django_user_agents.utils import get_user_agent
logger = logging.getLogger(__name__)
diff --git a/wger/utils/helpers.py b/wger/utils/helpers.py
index 2be09eb17..fdfc3e497 100644
--- a/wger/utils/helpers.py
+++ b/wger/utils/helpers.py
@@ -24,20 +24,24 @@ import random
import string
from functools import wraps
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.contrib.auth.tokens import default_token_generator
from django.http import Http404
-from django.shortcuts import get_object_or_404
+from django.shortcuts import (
+ get_object_or_404,
+ render
+)
+from django.template.exceptions import TemplateDoesNotExist
from django.utils.encoding import force_bytes
from django.utils.http import (
urlsafe_base64_decode,
urlsafe_base64_encode
)
-from django.shortcuts import render
+# Third Party
from django_user_agents.utils import get_user_agent
-from django.template.exceptions import TemplateDoesNotExist
+
logger = logging.getLogger(__name__)
diff --git a/wger/utils/language.py b/wger/utils/language.py
index 847a2ad80..ccb790915 100644
--- a/wger/utils/language.py
+++ b/wger/utils/language.py
@@ -15,7 +15,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.core.cache import cache
from django.core.exceptions import ObjectDoesNotExist
from django.utils import translation
diff --git a/wger/utils/managers.py b/wger/utils/managers.py
index 2f7fd62e2..77458f1c6 100644
--- a/wger/utils/managers.py
+++ b/wger/utils/managers.py
@@ -13,7 +13,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/>.
-# Third Party
+# Django
from django.db import models
from django.db.models.query import QuerySet
diff --git a/wger/utils/middleware.py b/wger/utils/middleware.py
index 90993a2e1..6afb73c59 100644
--- a/wger/utils/middleware.py
+++ b/wger/utils/middleware.py
@@ -19,12 +19,12 @@ Custom middleware
# Standard Library
import logging
-# Third Party
+# Django
from django.conf import settings
from django.contrib import auth
from django.contrib.auth import login as django_login
-from django.utils.functional import SimpleLazyObject
from django.utils.deprecation import MiddlewareMixin
+from django.utils.functional import SimpleLazyObject
# wger
from wger.core.demo import create_temporary_user
diff --git a/wger/utils/models.py b/wger/utils/models.py
index 5ee61da06..61fa1c2d1 100644
--- a/wger/utils/models.py
+++ b/wger/utils/models.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.db import models
from django.utils.translation import ugettext_lazy as _
diff --git a/wger/utils/pdf.py b/wger/utils/pdf.py
index 3fcdfa225..39a3c28c3 100644
--- a/wger/utils/pdf.py
+++ b/wger/utils/pdf.py
@@ -16,10 +16,12 @@
import datetime
from os.path import join as path_join
-# Third Party
+# Django
from django.conf import settings
from django.core.exceptions import ObjectDoesNotExist
from django.utils import translation
+
+# Third Party
from reportlab.lib.styles import (
ParagraphStyle,
StyleSheet1
diff --git a/wger/utils/tests/test_check_access.py b/wger/utils/tests/test_check_access.py
index 7dd10bcf6..77c9bec1e 100644
--- a/wger/utils/tests/test_check_access.py
+++ b/wger/utils/tests/test_check_access.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib.auth.models import (
AnonymousUser,
User
diff --git a/wger/utils/tests/test_middleware.py b/wger/utils/tests/test_middleware.py
index ab95f09b9..73c704f91 100644
--- a/wger/utils/tests/test_middleware.py
+++ b/wger/utils/tests/test_middleware.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/utils/widgets.py b/wger/utils/widgets.py
index e562dc3ae..1f0064ed4 100644
--- a/wger/utils/widgets.py
+++ b/wger/utils/widgets.py
@@ -20,7 +20,7 @@ import logging
import uuid
from itertools import chain
-# Third Party
+# Django
from django.forms import fields
from django.forms.widgets import (
CheckboxInput,
diff --git a/wger/weight/__init__.py b/wger/weight/__init__.py
index a915bb265..46a91e9bd 100644
--- a/wger/weight/__init__.py
+++ b/wger/weight/__init__.py
@@ -16,6 +16,8 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+# wger
from wger import get_version
+
VERSION = get_version()
diff --git a/wger/weight/admin.py b/wger/weight/admin.py
index 7f05ee077..fb62051e4 100644
--- a/wger/weight/admin.py
+++ b/wger/weight/admin.py
@@ -12,7 +12,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django.contrib import admin
# wger
diff --git a/wger/weight/forms.py b/wger/weight/forms.py
index b3654f6dc..110ab7e15 100644
--- a/wger/weight/forms.py
+++ b/wger/weight/forms.py
@@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU Affero General Public License
-# Third Party
+# Django
from django import forms
from django.forms import (
CharField,
diff --git a/wger/weight/helpers.py b/wger/weight/helpers.py
index 100a8b1b6..81d99817d 100644
--- a/wger/weight/helpers.py
+++ b/wger/weight/helpers.py
@@ -18,12 +18,12 @@
import csv
import datetime
import decimal
+import io
import json
import logging
-import io
from collections import OrderedDict
-# Third Party
+# Django
from django.core.cache import cache
# wger
diff --git a/wger/weight/management/commands/email-weight-reminder.py b/wger/weight/management/commands/email-weight-reminder.py
index 19f605edb..8877d5046 100644
--- a/wger/weight/management/commands/email-weight-reminder.py
+++ b/wger/weight/management/commands/email-weight-reminder.py
@@ -17,7 +17,7 @@
# Standard Library
import datetime
-# Third Party
+# Django
from django.conf import settings
from django.contrib.sites.models import Site
from django.core import mail
diff --git a/wger/weight/models.py b/wger/weight/models.py
index 79a2bfc27..c35c10339 100644
--- a/wger/weight/models.py
+++ b/wger/weight/models.py
@@ -15,7 +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/>.
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.core.validators import (
MaxValueValidator,
diff --git a/wger/weight/tests/test_csv_export.py b/wger/weight/tests/test_csv_export.py
index d4829d2c9..459aaf93b 100644
--- a/wger/weight/tests/test_csv_export.py
+++ b/wger/weight/tests/test_csv_export.py
@@ -15,7 +15,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/weight/tests/test_csv_import.py b/wger/weight/tests/test_csv_import.py
index 12d68a871..bc74e919a 100644
--- a/wger/weight/tests/test_csv_import.py
+++ b/wger/weight/tests/test_csv_import.py
@@ -15,7 +15,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/weight/tests/test_email_weight_reminder.py b/wger/weight/tests/test_email_weight_reminder.py
index 18b58ec76..ba35ee735 100644
--- a/wger/weight/tests/test_email_weight_reminder.py
+++ b/wger/weight/tests/test_email_weight_reminder.py
@@ -18,7 +18,7 @@ from datetime import (
timedelta
)
-# Third Party
+# Django
from django.contrib.auth.models import User
from django.core import mail
from django.core.management import call_command
diff --git a/wger/weight/tests/test_entry.py b/wger/weight/tests/test_entry.py
index 22ac298d0..76a58a315 100644
--- a/wger/weight/tests/test_entry.py
+++ b/wger/weight/tests/test_entry.py
@@ -16,7 +16,7 @@
import datetime
import decimal
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/weight/tests/test_overview.py b/wger/weight/tests/test_overview.py
index e8f6643b8..abb70fdc6 100644
--- a/wger/weight/tests/test_overview.py
+++ b/wger/weight/tests/test_overview.py
@@ -15,7 +15,7 @@
# Standard Library
import logging
-# Third Party
+# Django
from django.urls import reverse
# wger
diff --git a/wger/weight/urls.py b/wger/weight/urls.py
index 3de3bfee0..a6a288b92 100644
--- a/wger/weight/urls.py
+++ b/wger/weight/urls.py
@@ -15,7 +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/>.
-# Third Party
+# Django
from django.conf.urls import url
from django.contrib.auth.decorators import login_required
diff --git a/wger/weight/views.py b/wger/weight/views.py
index 0b5e64011..4e5612c6e 100644
--- a/wger/weight/views.py
+++ b/wger/weight/views.py
@@ -19,12 +19,8 @@ import csv
import datetime
import logging
-# Third Party
+# Django
from django.contrib.auth.decorators import login_required
-from django.urls import (
- reverse,
- reverse_lazy
-)
from django.db.models import (
Max,
Min
@@ -33,6 +29,10 @@ from django.http import (
HttpResponse,
HttpResponseRedirect
)
+from django.urls import (
+ reverse,
+ reverse_lazy
+)
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -41,6 +41,8 @@ from django.views.generic import (
CreateView,
UpdateView
)
+
+# Third Party
from formtools.preview import FormPreview
from rest_framework.decorators import api_view
from rest_framework.response import Response
diff --git a/wger/wsgi.py b/wger/wsgi.py
index 1ec31d3d8..295ed61c1 100644
--- a/wger/wsgi.py
+++ b/wger/wsgi.py
@@ -16,7 +16,7 @@ framework.
# Standard Library
import os
-# Third Party
+# Django
from django.core.wsgi import get_wsgi_application