removing future

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

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

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
 

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

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

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
 

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
 

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
 

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
 
 

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']

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 rowingdata import (
-from __future__ import unicode_literals
+    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

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

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

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

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

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 (

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

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 (

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
 

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
 

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
 

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

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

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

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

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

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

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

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

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

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 *
 

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)

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

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

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

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

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
 

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 *
 

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

rowers/utils.py

@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from datetime import date
 import random
 from datetime import timedelta

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 *

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

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

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 *
 

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

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 *
 

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

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

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

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 *
 

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 *
 

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

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',
+    'rules',
-	'taggit',
+    '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': [
+#        'loaders': [
-#		'django.template.loaders.app_directories.Loader',
+#        'django.template.loaders.app_directories.Loader',
-#	    ],
+#        ],
-	    },
+        },
 
     },
 ]
@@ -166,25 +161,25 @@ CONN_MAX_AGE = 0
 
 DATABASES = {
     'default': {
-	'ENGINE': 'django.db.backends.mysql',
+        'ENGINE': 'django.db.backends.mysql',
-	'NAME': CFG['db_name'],
+        'NAME': CFG['db_name'],
-	'USER': CFG['db_user'],
+        'USER': CFG['db_user'],
-	'PASSWORD': CFG['db_password'],
+        'PASSWORD': CFG['db_password'],
-	'HOST': CFG['db_host'],
+        'HOST': CFG['db_host'],
-	'PORT': CFG['db_port'],
+        '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',
+    'CHARSET': 'utf8',
-	'COLLATION': 'utf8_general_ci',
+    'COLLATION': 'utf8_general_ci',
-	},
+    },
 }
 
 
@@ -197,9 +192,9 @@ AUTH_PASSWORD_VALIDATORS = [
     },
     {
         'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-		'OPTIONS': {
+    'OPTIONS': {
-			'min_length': 9,
+    '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_TOKEN = CFG['workouts_fit_token']
-	WORKOUTS_FIT_URL = CFG['workouts_fit_url']
+    WORKOUTS_FIT_URL = CFG['workouts_fit_url']
 except KeyError: # pragma: no cover
-	WORKOUTS_FIT_TOKEN = 'aapnootmies'
+    WORKOUTS_FIT_TOKEN = 'aapnootmies'
-	WORKOUTS_FIT_URL = 'http://localhost:50053/tojson'
+    WORKOUTS_FIT_URL = 'http://localhost:50053/tojson'
 
 # Recaptcha
 
 try:
-	RECAPTCHA_SITE_KEY = CFG['recaptcha_site_key']
+    RECAPTCHA_SITE_KEY = CFG['recaptcha_site_key']
-	RECAPTCHA_SITE_SECRET = CFG['recaptcha_site_secret']
+    RECAPTCHA_SITE_SECRET = CFG['recaptcha_site_secret']
 except KeyError: # pragma: no cover
-	RECAPTCHA_SITE_KEY = ''
+    RECAPTCHA_SITE_KEY = ''
-	RECAPTCHA_SITE_SECRET = ''
+    RECAPTCHA_SITE_SECRET = ''
 
 GEOIP_PATH = STATIC_ROOT
 

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',
+        #        'CHARSET': 'utf8',
-        #	    'COLLATION': 'utf8_general_ci',
+        #        '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']