From 221953bfdf219a18527d96f3be7199a831591019 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 15 Feb 2022 08:23:48 +0100 Subject: [PATCH] removing future --- rowers/__init__.py | 4 -- rowers/admin.py | 4 -- rowers/apps.py | 4 -- rowers/braintreestuff.py | 4 -- rowers/c2stuff.py | 4 -- rowers/celery.py | 4 -- rowers/context_processors.py | 4 -- rowers/courses.py | 4 -- rowers/courseutils.py | 4 -- rowers/database.py | 5 -- rowers/dataprep.py | 31 ++++++++-- rowers/dataprepnodjango.py | 4 -- rowers/datautils.py | 4 -- rowers/decorators.py | 4 -- rowers/emails.py | 4 -- rowers/forms.py | 6 -- rowers/imports.py | 5 -- rowers/interactiveplots.py | 4 -- rowers/longtask.py | 6 -- rowers/metrics.py | 5 -- rowers/mytypes.py | 4 -- rowers/nkstuff.py | 5 -- rowers/opaque.py | 4 -- rowers/ownapistuff.py | 5 -- rowers/payments.py | 4 -- rowers/permissions.py | 4 -- rowers/plannedsessions.py | 4 -- rowers/plots.py | 4 -- rowers/polarstuff.py | 5 -- rowers/rows.py | 4 -- rowers/rp3stuff.py | 5 -- rowers/serializers.py | 4 -- rowers/sporttracksstuff.py | 5 -- rowers/stravastuff.py | 5 -- rowers/tasks.py | 4 -- rowers/tasks_standalone.py | 4 -- rowers/teams.py | 4 -- rowers/tpstuff.py | 5 -- rowers/traverselinktest.py | 5 -- rowers/utils.py | 1 - rowers/views/__init__.py | 4 -- rowers/views/analysisviews.py | 5 -- rowers/views/apiviews.py | 4 -- rowers/views/errorviews.py | 4 -- rowers/views/importviews.py | 4 -- rowers/views/otherviews.py | 4 -- rowers/views/paymentviews.py | 4 -- rowers/views/planviews.py | 4 -- rowers/views/racesviews.py | 4 -- rowers/views/teamviews.py | 4 -- rowers/views/userviews.py | 4 -- rowers/views/workoutviews.py | 4 -- rowsandall_app/settings.py | 103 ++++++++++++++++----------------- rowsandall_app/settings_dev.py | 15 ++--- 54 files changed, 83 insertions(+), 283 deletions(-) diff --git a/rowers/__init__.py b/rowers/__init__.py index f6f9ea6b..f22c3fb4 100644 --- a/rowers/__init__.py +++ b/rowers/__init__.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from rowers.celery import app as celery_app diff --git a/rowers/admin.py b/rowers/admin.py index 3d9214f7..27453428 100644 --- a/rowers/admin.py +++ b/rowers/admin.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from django.contrib import admin from django.contrib.auth.admin import UserAdmin from django.contrib.auth.models import User diff --git a/rowers/apps.py b/rowers/apps.py index 750e0562..82adbc07 100644 --- a/rowers/apps.py +++ b/rowers/apps.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from django.apps import AppConfig diff --git a/rowers/braintreestuff.py b/rowers/braintreestuff.py index 081d979e..2f38f0bc 100644 --- a/rowers/braintreestuff.py +++ b/rowers/braintreestuff.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from rowers.models import Rower, PaidPlan, CoachingGroup from rowers.utils import ProcessorCustomerError from rowsandall_app.settings import ( @@ -20,9 +19,6 @@ from rowers.utils import myqueue import rowers.fakturoid as fakturoid from braintree.exceptions.invalid_signature_error import InvalidSignatureError import time -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals import braintree from django.utils import timezone diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index d85962d0..1e2316f4 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -1,10 +1,6 @@ -from __future__ import absolute_import from django.core.exceptions import PermissionDenied from rowers.models import C2WorldClassAgePerformance from rowers.utils import myqueue -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals # The interactions with the Concept2 logbook API # All C2 related functions should be defined here diff --git a/rowers/celery.py b/rowers/celery.py index d25d2a5a..7e15c24e 100644 --- a/rowers/celery.py +++ b/rowers/celery.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals import os diff --git a/rowers/context_processors.py b/rowers/context_processors.py index cb4f0842..86ea6aa9 100644 --- a/rowers/context_processors.py +++ b/rowers/context_processors.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from django.conf import settings # import the settings file diff --git a/rowers/courses.py b/rowers/courses.py index a773992b..8b4661dd 100644 --- a/rowers/courses.py +++ b/rowers/courses.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from rowers.courseutils import coursetime_paths, coursetime_first, time_in_path import pandas as pd from rowers.models import ( @@ -12,9 +11,6 @@ from rowers.utils import geo_distance import rowers.dataprep as dataprep from timezonefinder import TimezoneFinder import numpy as np -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals # All the Courses related methods diff --git a/rowers/courseutils.py b/rowers/courseutils.py index 2105c577..b31d7750 100644 --- a/rowers/courseutils.py +++ b/rowers/courseutils.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals import time diff --git a/rowers/database.py b/rowers/database.py index 653ad966..7032795b 100644 --- a/rowers/database.py +++ b/rowers/database.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - from django.conf import settings user = settings.DATABASES['default']['USER'] diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 23dfe45d..1493bdce 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from rowers.metrics import axes, calc_trimp, rowingmetrics, dtypes, metricsgroups from rowers.utils import lbstoN, myqueue, wavg, dologging from rowers.mytypes import otwtypes, otetypes, rowtypes @@ -33,13 +32,35 @@ import zipfile import os from rowers.models import strokedatafields from rowingdata.csvparsers import HumonParser -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals + +from rowingdata import ( + KinoMapParser, + ExcelTemplate, + TCXParser, + MysteryParser, + RowProParser, + RitmoTimeParser, + QuiskeParser, + RowPerfectParser, + CoxMateParser, + BoatCoachParser, + BoatCoachOTWParser, + BoatCoachAdvancedParser, + painsledDesktopParser, + speedcoachParser, + SpeedCoach2Parser, + ErgStickParser, + FITParser, + ErgDataParser, + HumonParser, + ETHParser, + NKLiNKLogbookParser, + HeroParser, + SmartRowParser, + ) # All the data preparation, data cleaning and data mangling should # be defined here -from __future__ import unicode_literals, absolute_import from rowers.models import ( Workout, Team, CalcAgePerformance, C2WorldClassAgePerformance, User diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index fb89fd0e..50a7a5b9 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -1,11 +1,7 @@ -from __future__ import absolute_import from rowers.utils import totaltime_sec_to_string from rowers.metrics import dtypes import datetime from scipy.signal import savgol_filter -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals # This is Data prep used for testing purposes (no Django environment) # Uses the debug SQLite database for stroke data diff --git a/rowers/datautils.py b/rowers/datautils.py index a097e89b..b54b87a8 100644 --- a/rowers/datautils.py +++ b/rowers/datautils.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals import pandas as pd import numpy as np diff --git a/rowers/decorators.py b/rowers/decorators.py index 5b856e20..60a844df 100644 --- a/rowers/decorators.py +++ b/rowers/decorators.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from django.contrib.auth.decorators import login_required, user_passes_test from django.urls import reverse diff --git a/rowers/emails.py b/rowers/emails.py index 4fe9e034..fadc4851 100644 --- a/rowers/emails.py +++ b/rowers/emails.py @@ -1,8 +1,4 @@ -from __future__ import absolute_import from django.contrib.staticfiles import finders -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals import os import time diff --git a/rowers/forms.py b/rowers/forms.py index 42be40a5..d3bbc613 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from rowers.models import VirtualRace, GeoCourse from rowers.utils import rankingdistances, rankingdurations from rowers.utils import ( @@ -7,11 +6,6 @@ from rowers.utils import ( ) from rowers.utils import palettes from time import strftime -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -from __future__ import unicode_literals, absolute_import from django import forms from django.contrib.admin.widgets import FilteredSelectMultiple from rowers.models import ( diff --git a/rowers/imports.py b/rowers/imports.py index d34c41cf..9877ddab 100644 --- a/rowers/imports.py +++ b/rowers/imports.py @@ -1,9 +1,4 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import unicode_literals, absolute_import # All the functionality to connect to SportTracks # Python diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index bdc8e404..501dbba7 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from rowers.metrics import axes, axlabels, yaxminima, yaxmaxima, get_yaxminima, get_yaxmaxima from rowers.dataprep import nicepaceformat, niceformat, strfdelta from rowers.datautils import p0, rpetotss @@ -49,9 +48,6 @@ from bokeh.models import ( from bokeh.layouts import column as layoutcolumn from bokeh.layouts import row as layoutrow from bokeh.embed import components -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals import colorsys from rowers.models import ( diff --git a/rowers/longtask.py b/rowers/longtask.py index 48a693f9..f45cb9da 100644 --- a/rowers/longtask.py +++ b/rowers/longtask.py @@ -1,14 +1,8 @@ -from __future__ import absolute_import from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV from rowsandall_app.settings import SITE_URL import requests import threading import redis -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - -from __future__ import absolute_import import numpy as np import time diff --git a/rowers/metrics.py b/rowers/metrics.py index 7f68bc10..285529b3 100644 --- a/rowers/metrics.py +++ b/rowers/metrics.py @@ -1,9 +1,4 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import absolute_import from rowers.utils import lbstoN import numpy as np diff --git a/rowers/mytypes.py b/rowers/mytypes.py index 1098b45d..1950f14a 100644 --- a/rowers/mytypes.py +++ b/rowers/mytypes.py @@ -1,8 +1,4 @@ -from __future__ import absolute_import from bokeh.palettes import Category10, Category20, Category20c -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from six import iteritems import collections diff --git a/rowers/nkstuff.py b/rowers/nkstuff.py index ad1889d3..7fad2cdf 100644 --- a/rowers/nkstuff.py +++ b/rowers/nkstuff.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from requests.auth import HTTPBasicAuth from rowers.nkimportutils import * from rowers.imports import * @@ -13,10 +12,6 @@ import rowers.mytypes as mytypes from rowers.utils import myqueue from iso8601 import ParseError from rowers.rower_rules import is_workout_user, ispromember -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import unicode_literals, absolute_import import time from time import strftime diff --git a/rowers/opaque.py b/rowers/opaque.py index 72e9e3db..e108dcd0 100644 --- a/rowers/opaque.py +++ b/rowers/opaque.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals import struct import base64 diff --git a/rowers/ownapistuff.py b/rowers/ownapistuff.py index 92c86ea8..82b2250a 100644 --- a/rowers/ownapistuff.py +++ b/rowers/ownapistuff.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import unicode_literals, absolute_import # Interactions with Rowsandall.com API. Not fully complete. # Python diff --git a/rowers/payments.py b/rowers/payments.py index 8ccfea36..87d63e5e 100644 --- a/rowers/payments.py +++ b/rowers/payments.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from rowers.models import Rower, PaidPlan # run once - copies plans to paypal diff --git a/rowers/permissions.py b/rowers/permissions.py index 191c343c..634932b3 100644 --- a/rowers/permissions.py +++ b/rowers/permissions.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals # Defines permissions for objects (API related) from rest_framework import permissions diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 4c2f3ea9..b9edb3a2 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from rowers.emails import htmlstrip, htmlstripnobr from rowers.models import ( Rower, Workout, Team, @@ -28,9 +27,6 @@ from rowingdata import rowingdata as rrdata import arrow import pandas as pd import json -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals # Python from django.utils import timezone diff --git a/rowers/plots.py b/rowers/plots.py index b241981c..6d4934bc 100644 --- a/rowers/plots.py +++ b/rowers/plots.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from matplotlib.ticker import MultipleLocator, FuncFormatter, NullFormatter import matplotlib.pyplot as plt diff --git a/rowers/polarstuff.py b/rowers/polarstuff.py index 997682f0..30a865fe 100644 --- a/rowers/polarstuff.py +++ b/rowers/polarstuff.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from rowers.rower_rules import ispromember from stravalib.exc import ActivityUploadFailed, TimeoutExceeded from rowers.models import Rower, Workout @@ -15,11 +14,7 @@ import rowers.dataprep as dataprep from rowers.tasks import handle_request_post import pandas as pd from rowingdata import rowingdata -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import unicode_literals, absolute_import # All the functionality needed to connect to Strava # Python diff --git a/rowers/rows.py b/rowers/rows.py index b84dd6b6..b68ac1dc 100644 --- a/rowers/rows.py +++ b/rowers/rows.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals import time import gzip diff --git a/rowers/rp3stuff.py b/rowers/rp3stuff.py index 2c49fb2d..f4fffff1 100644 --- a/rowers/rp3stuff.py +++ b/rowers/rp3stuff.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from celery import Celery, app from rowers.rower_rules import is_workout_user import time @@ -13,10 +12,6 @@ from rowsandall_app.settings import ( UPLOAD_SERVICE_URL, UPLOAD_SERVICE_SECRET ) from rowers.utils import myqueue -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import unicode_literals, absolute_import # All the functionality needed to connect to Runkeeper from rowers.imports import * diff --git a/rowers/serializers.py b/rowers/serializers.py index c723e377..0bbd017e 100644 --- a/rowers/serializers.py +++ b/rowers/serializers.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals # Serializers. Defines which fields from an object get to the JSON object # Also optionally define POST, PATCH methods (create, update) diff --git a/rowers/sporttracksstuff.py b/rowers/sporttracksstuff.py index 6aa3bb5e..71b2c460 100644 --- a/rowers/sporttracksstuff.py +++ b/rowers/sporttracksstuff.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from rowers.tasks import handle_sporttracks_sync from rowers.rower_rules import is_workout_user import rowers.mytypes as mytypes @@ -11,11 +10,7 @@ from rowsandall_app.settings import ( import re from rowers.imports import * from rowers.utils import myqueue -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import unicode_literals, absolute_import # All the functionality to connect to SportTracks import numpy diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index 50043c47..e9312c9d 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from rowers.tasks import handle_strava_sync, fetch_strava_workout from stravalib.exc import ActivityUploadFailed, TimeoutExceeded from rowers.rower_rules import is_workout_user, ispromember @@ -16,10 +15,6 @@ from rowers.utils import myqueue from iso8601 import ParseError import stravalib from rowers.dataprep import columndict -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import unicode_literals, absolute_import # All the functionality needed to connect to Strava from scipy import optimize diff --git a/rowers/tasks.py b/rowers/tasks.py index 3a69de1d..6bccf2a3 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import import math from rowers.courseutils import ( coursetime_paths, coursetime_first, time_in_path, @@ -16,9 +15,6 @@ import arrow import rowers.longtask as longtask import requests import rowers.datautils as datautils -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals """ Background tasks done by Celery (develop) or QR (production) """ import os diff --git a/rowers/tasks_standalone.py b/rowers/tasks_standalone.py index d932a91c..f607e618 100644 --- a/rowers/tasks_standalone.py +++ b/rowers/tasks_standalone.py @@ -1,12 +1,8 @@ -from __future__ import absolute_import from django.contrib.auth.models import User from rowers.models import Workout from django_rq import job from celery import app import time -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals import os import sys diff --git a/rowers/teams.py b/rowers/teams.py index 262dd447..78fe495e 100644 --- a/rowers/teams.py +++ b/rowers/teams.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from rowers.rower_rules import is_team_manager, is_team_member, is_coach, user_is_basic from rowers.models import ValidationError, PlannedSession from rowers.tasks import ( @@ -18,9 +17,6 @@ from rowers.models import ( Rower, Workout, Team, TeamInvite, User, TeamRequest, CoachRequest, CoachOffer, CoachingGroup ) -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals # All the Team related methods diff --git a/rowers/tpstuff.py b/rowers/tpstuff.py index 46013337..81c3f0a4 100644 --- a/rowers/tpstuff.py +++ b/rowers/tpstuff.py @@ -1,12 +1,7 @@ -from __future__ import absolute_import from celery import Celery, app from rowers.rower_rules import is_workout_user import time from django_rq import job -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import unicode_literals, absolute_import # All the functionality needed to connect to Runkeeper from rowers.imports import * diff --git a/rowers/traverselinktest.py b/rowers/traverselinktest.py index ad0c6545..d6563498 100644 --- a/rowers/traverselinktest.py +++ b/rowers/traverselinktest.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import print_function from bs4 import BeautifulSoup import re from django.test import TestCase, Client, override_settings diff --git a/rowers/utils.py b/rowers/utils.py index 0adc4c3f..7f47f5b4 100644 --- a/rowers/utils.py +++ b/rowers/utils.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import from datetime import date import random from datetime import timedelta diff --git a/rowers/views/__init__.py b/rowers/views/__init__.py index 1144c37c..9f35d931 100644 --- a/rowers/views/__init__.py +++ b/rowers/views/__init__.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from .analysisviews import * from .apiviews import * diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 0569917e..7f9379d4 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -1,11 +1,6 @@ -from __future__ import absolute_import import time from rowers.forms import analysischoices from django.contrib.staticfiles import finders -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals -from __future__ import unicode_literals, absolute_import from rowers.views.statements import * import collections diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py index af789c55..08dc5be7 100644 --- a/rowers/views/apiviews.py +++ b/rowers/views/apiviews.py @@ -1,8 +1,4 @@ -from __future__ import absolute_import from rest_framework_swagger.renderers import OpenAPIRenderer, SwaggerUIRenderer -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from rowers.views.statements import * from rowers.tasks import handle_calctrimp diff --git a/rowers/views/errorviews.py b/rowers/views/errorviews.py index 23f5068c..7117ce55 100644 --- a/rowers/views/errorviews.py +++ b/rowers/views/errorviews.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from rowers.views.statements import * diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 960688f5..467fc86a 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -1,8 +1,4 @@ -from __future__ import absolute_import from rowsandall_app.settings import NK_OAUTH_LOCATION -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from rowers.views.statements import * from rowers.plannedsessions import get_dates_timeperiod diff --git a/rowers/views/otherviews.py b/rowers/views/otherviews.py index 14ee6df6..d6347a38 100644 --- a/rowers/views/otherviews.py +++ b/rowers/views/otherviews.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from rowers.views.statements import * diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py index 4fa2b841..b5cde394 100644 --- a/rowers/views/paymentviews.py +++ b/rowers/views/paymentviews.py @@ -1,11 +1,7 @@ -from __future__ import absolute_import from django.utils.encoding import force_bytes, force_text from rowers.tokens import account_activation_token from django.contrib.sites.shortcuts import get_current_site from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from rowers.views.statements import * from django.core.mail import EmailMessage diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index 7f22554c..aa0a0bc4 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -1,10 +1,6 @@ -from __future__ import absolute_import from rowers.plannedsessions import cratiocolors, checkscores from rowers.utils import allmonths from rowers.utils import allsundays -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from rowers.views.statements import * from rowingdata import trainingparser diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py index db95160a..a461524f 100644 --- a/rowers/views/racesviews.py +++ b/rowers/views/racesviews.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from rowers.views.statements import * from rowsandall_app.settings import SITE_URL diff --git a/rowers/views/teamviews.py b/rowers/views/teamviews.py index a882032e..505fe24f 100644 --- a/rowers/views/teamviews.py +++ b/rowers/views/teamviews.py @@ -1,8 +1,4 @@ -from __future__ import absolute_import from rowers.forms import TeamInviteCodeForm -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from rowers.views.statements import * diff --git a/rowers/views/userviews.py b/rowers/views/userviews.py index 24718c14..4ff5545e 100644 --- a/rowers/views/userviews.py +++ b/rowers/views/userviews.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals from rowers.views.statements import * diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 2b9341f3..11b1a8ef 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -1,7 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals import hashlib from shutil import copyfile diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 83fa7153..5dccfd43 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -1,8 +1,3 @@ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - """ Django settings for rowsandall_app project. @@ -55,7 +50,7 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' INSTALLED_APPS = [ 'rowers', - 'survey', + 'survey', # 'cvkbrno', 'django.contrib.admin', 'django.contrib.auth', @@ -81,14 +76,14 @@ INSTALLED_APPS = [ 'tz_detect', 'django_social_share', 'django_countries', - 'rules', - 'taggit', + 'rules', + 'taggit', ] AUTHENTICATION_BACKENDS = ( 'oauth2_provider.backends.OAuth2Backend', # Uncomment following if you want to access the admin - 'rules.permissions.ObjectPermissionBackend', + 'rules.permissions.ObjectPermissionBackend', 'django.contrib.auth.backends.ModelBackend', ) @@ -109,7 +104,7 @@ MIDDLEWARE = [ 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'tz_detect.middleware.TimezoneMiddleware', - 'rowers.middleware.SurveyMiddleWare', + 'rowers.middleware.SurveyMiddleWare', 'rowers.middleware.GDPRMiddleWare', # 'rowers.middleware.PowerTimeFitnessMetricMiddleWare', 'rowers.middleware.RowerPlanMiddleWare', @@ -137,18 +132,18 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', - 'django.template.context_processors.i18n', + 'django.template.context_processors.i18n', # 'context_processors.google_analytics', 'context_processors.warning_message', 'rowers.context_processors.braintree_merchant', ], - 'libraries' : { + 'libraries' : { 'staticfiles': 'django.templatetags.static', } -# 'loaders': [ -# 'django.template.loaders.app_directories.Loader', -# ], - }, +# 'loaders': [ +# 'django.template.loaders.app_directories.Loader', +# ], + }, }, ] @@ -166,25 +161,25 @@ CONN_MAX_AGE = 0 DATABASES = { 'default': { - 'ENGINE': 'django.db.backends.mysql', - 'NAME': CFG['db_name'], - 'USER': CFG['db_user'], - 'PASSWORD': CFG['db_password'], - 'HOST': CFG['db_host'], - 'PORT': CFG['db_port'], + 'ENGINE': 'django.db.backends.mysql', + 'NAME': CFG['db_name'], + 'USER': CFG['db_user'], + 'PASSWORD': CFG['db_password'], + 'HOST': CFG['db_host'], + 'PORT': CFG['db_port'], 'OPTIONS': { 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'", 'charset': 'utf8mb4', - } + } }, 'slave': { 'ENGINE': 'django.db.backends.sqlite3', 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - }, + }, 'TEST': { - 'CHARSET': 'utf8', - 'COLLATION': 'utf8_general_ci', - }, + 'CHARSET': 'utf8', + 'COLLATION': 'utf8_general_ci', + }, } @@ -197,9 +192,9 @@ AUTH_PASSWORD_VALIDATORS = [ }, { 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', - 'OPTIONS': { - 'min_length': 9, - } + 'OPTIONS': { + 'min_length': 9, + } }, { 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', @@ -207,9 +202,9 @@ AUTH_PASSWORD_VALIDATORS = [ { 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', }, - { - 'NAME': 'rowers.validator.LettersAndDigitsValidator', - } + { + 'NAME': 'rowers.validator.LettersAndDigitsValidator', + } ] @@ -272,13 +267,13 @@ LOGOUT_REDIRECT_URL = '/' PROGRESS_CACHE_SECRET = CFG['progress_cache_secret'] try: - UPLOAD_SERVICE_URL = CFG['upload_service_url'] + UPLOAD_SERVICE_URL = CFG['upload_service_url'] except KeyError: # pragma: no cover - UPLOAD_SERVICE_URL = "http://localhost:8000/rowers/workout/api/upload/" + UPLOAD_SERVICE_URL = "http://localhost:8000/rowers/workout/api/upload/" try: - UPLOAD_SERVICE_SECRET = CFG['upload_service_secret'] + UPLOAD_SERVICE_SECRET = CFG['upload_service_secret'] except KeyError: # pragma: no cover - UPLOAD_SERVICE_SECRET = "FoYezZWLSyfAVimumpHEeYsJjsNCerxV" + UPLOAD_SERVICE_SECRET = "FoYezZWLSyfAVimumpHEeYsJjsNCerxV" # Concept 2 C2_CLIENT_ID = CFG['c2_client_id'] @@ -456,7 +451,7 @@ REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': ( 'rest_framework.authentication.BasicAuthentication', # 'rest_framework.authentication.SessionAuthentication', -# 'rest_framework.authentication.TokenAuthentication', +# 'rest_framework.authentication.TokenAuthentication', 'oauth2_provider.contrib.rest_framework.OAuth2Authentication', ), 'PAGE_SIZE': 20, @@ -473,14 +468,14 @@ SWAGGER_SETTINGS = { 'authorizationUrl':'/rowers/o/authorize', 'flow': 'implicit', }, - 'api_key': { + 'api_key': { 'type': 'apiKey', 'in': 'header', 'name': 'Authorization' }, }, 'SHOW_REQUEST_HEADERS': True, - 'USE_SESSION_AUTH': True, + 'USE_SESSION_AUTH': True, 'JSON_EDITOR': True, } @@ -555,19 +550,19 @@ except KeyError: # pragma: no cover PAYMENT_PROCESSING_ON = False try: - FAKTUROID_API_KEY = CFG['fakturoid_api_key'] + FAKTUROID_API_KEY = CFG['fakturoid_api_key'] except KeyError: # pragma: no cover - FAKTUROID_API_KEY = '' + FAKTUROID_API_KEY = '' try: - FAKTUROID_EMAIL = CFG['fakturoid_email'] + FAKTUROID_EMAIL = CFG['fakturoid_email'] except KeyError: # pragma: no cover - FAKTUROID_EMAIL = '' + FAKTUROID_EMAIL = '' try: - FAKTUROID_SLUG = CFG['fakturoid_slug'] + FAKTUROID_SLUG = CFG['fakturoid_slug'] except KeyError: # pragma: no cover - FAKTUROID_SLUG = '' + FAKTUROID_SLUG = '' # ID obfuscation try: @@ -582,20 +577,20 @@ except KeyError: # pragma: no cover CELERY = False try: - WORKOUTS_FIT_TOKEN = CFG['workouts_fit_token'] - WORKOUTS_FIT_URL = CFG['workouts_fit_url'] + WORKOUTS_FIT_TOKEN = CFG['workouts_fit_token'] + WORKOUTS_FIT_URL = CFG['workouts_fit_url'] except KeyError: # pragma: no cover - WORKOUTS_FIT_TOKEN = 'aapnootmies' - WORKOUTS_FIT_URL = 'http://localhost:50053/tojson' + WORKOUTS_FIT_TOKEN = 'aapnootmies' + WORKOUTS_FIT_URL = 'http://localhost:50053/tojson' # Recaptcha try: - RECAPTCHA_SITE_KEY = CFG['recaptcha_site_key'] - RECAPTCHA_SITE_SECRET = CFG['recaptcha_site_secret'] + RECAPTCHA_SITE_KEY = CFG['recaptcha_site_key'] + RECAPTCHA_SITE_SECRET = CFG['recaptcha_site_secret'] except KeyError: # pragma: no cover - RECAPTCHA_SITE_KEY = '' - RECAPTCHA_SITE_SECRET = '' + RECAPTCHA_SITE_KEY = '' + RECAPTCHA_SITE_SECRET = '' GEOIP_PATH = STATIC_ROOT diff --git a/rowsandall_app/settings_dev.py b/rowsandall_app/settings_dev.py index fccd68df..dd826f6f 100644 --- a/rowsandall_app/settings_dev.py +++ b/rowsandall_app/settings_dev.py @@ -27,19 +27,20 @@ if TESTING or use_sqlite: 'ENGINE': 'django.db.backends.sqlite3', 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), 'HOST': 'localhost', - 'PASSWORD': 'roeidata', + 'USER': '', + 'PASSWORD': 'roeidata', 'PORT': '3306', }, # 'TEST': { - # 'CHARSET': 'utf8', - # 'COLLATION': 'utf8_general_ci', + # 'CHARSET': 'utf8', + # 'COLLATION': 'utf8_general_ci', # }, # 'slave': { - # 'ENGINE': 'django.db.backends.mysql', + # 'ENGINE': 'django.db.backends.mysql', # 'NAME': 'rowsanda_107501', - # 'USER': 'rowsanda_107501', + # 'USER': 'rowsanda_107501', - # } + # } } @@ -82,7 +83,7 @@ STATIC_ROOT = BASE_DIR #STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static'), - os.path.join(BASE_DIR, 'static/plots'),] + os.path.join(BASE_DIR, 'static/plots'),] INTERNAL_IPS = ['127.0.0.1']