diff --git a/rowers/__init__.py b/rowers/__init__.py index 4a44fb0d..f6f9ea6b 100644 --- a/rowers/__init__.py +++ b/rowers/__init__.py @@ -1,4 +1,8 @@ -from __future__ import absolute_import, unicode_literals +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 7ef887fb..cf091c81 100644 --- a/rowers/admin.py +++ b/rowers/admin.py @@ -1,3 +1,7 @@ +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 c41466d3..c14ad7d7 100644 --- a/rowers/apps.py +++ b/rowers/apps.py @@ -1,3 +1,6 @@ +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 ac46f4e2..c7238887 100644 --- a/rowers/braintreestuff.py +++ b/rowers/braintreestuff.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import braintree from django.utils import timezone import datetime diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index d69960f1..f58102fb 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -1,4 +1,9 @@ -from __future__ import unicode_literals, absolute_import +from __future__ import absolute_import +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 # (There is still some stuff defined directly in views.py. Need to diff --git a/rowers/celery.py b/rowers/celery.py index 77d84ba3..aa35dd3b 100644 --- a/rowers/celery.py +++ b/rowers/celery.py @@ -1,4 +1,7 @@ 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 9aa44d1d..56103ab3 100644 --- a/rowers/context_processors.py +++ b/rowers/context_processors.py @@ -1,3 +1,8 @@ +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 def braintree_merchant(request): diff --git a/rowers/courses.py b/rowers/courses.py index f89dabb2..f0d7ecb3 100644 --- a/rowers/courses.py +++ b/rowers/courses.py @@ -1,4 +1,8 @@ -from __future__ import unicode_literals, absolute_import +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + # All the Courses related methods # Python diff --git a/rowers/courseutils.py b/rowers/courseutils.py index 37686b27..39fda8bf 100644 --- a/rowers/courseutils.py +++ b/rowers/courseutils.py @@ -1,3 +1,7 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals # low level methods def coordinate_in_path(latitude,longitude, p): diff --git a/rowers/database.py b/rowers/database.py index cd420ad2..46bc39d8 100644 --- a/rowers/database.py +++ b/rowers/database.py @@ -1,3 +1,8 @@ +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 31b18475..09e7d504 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + # All the data preparation, data cleaning and data mangling should # be defined here from __future__ import unicode_literals, absolute_import diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index 6e742590..7e772dd6 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import +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 from rowingdata import rowingdata as rrdata diff --git a/rowers/datautils.py b/rowers/datautils.py index 8ce80059..2230a99f 100644 --- a/rowers/datautils.py +++ b/rowers/datautils.py @@ -1,3 +1,8 @@ +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 from scipy.interpolate import griddata diff --git a/rowers/decorators.py b/rowers/decorators.py index 3d356dd2..36a4a3b5 100644 --- a/rowers/decorators.py +++ b/rowers/decorators.py @@ -1,3 +1,8 @@ +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.http import HttpResponseRedirect diff --git a/rowers/emails.py b/rowers/emails.py index 8e4605d3..b232ee09 100644 --- a/rowers/emails.py +++ b/rowers/emails.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import os import time import gc diff --git a/rowers/forms.py b/rowers/forms.py index 5dd3d149..cf130391 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -1,3 +1,8 @@ +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 from django import forms from django.contrib.admin.widgets import FilteredSelectMultiple diff --git a/rowers/imports.py b/rowers/imports.py index c39064e6..ad3f2f4b 100644 --- a/rowers/imports.py +++ b/rowers/imports.py @@ -1,3 +1,8 @@ +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 diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 3e95147a..eb40e154 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import colorsys from rowers.models import ( Workout, User, Rower, WorkoutForm,RowerForm, diff --git a/rowers/longtask.py b/rowers/longtask.py index c9380bea..db52a91d 100644 --- a/rowers/longtask.py +++ b/rowers/longtask.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import +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/mailprocessing.py b/rowers/mailprocessing.py index ade6419d..1e58ece0 100644 --- a/rowers/mailprocessing.py +++ b/rowers/mailprocessing.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + # Processes emails sent to workouts@rowsandall.com """ Processes emails sent to workouts@rowsandall.com """ import shutil diff --git a/rowers/metrics.py b/rowers/metrics.py index c5682b0e..2f5c12b9 100644 --- a/rowers/metrics.py +++ b/rowers/metrics.py @@ -1,3 +1,8 @@ +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/models.py b/rowers/models.py index 016db05e..de3ee877 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -1,3 +1,7 @@ +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 from django.db import models,IntegrityError diff --git a/rowers/mytypes.py b/rowers/mytypes.py index 3eb903d2..d3ae878e 100644 --- a/rowers/mytypes.py +++ b/rowers/mytypes.py @@ -1,3 +1,7 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals from six import iteritems workouttypes = ( diff --git a/rowers/opaque.py b/rowers/opaque.py index 0fc59a69..949572d9 100644 --- a/rowers/opaque.py +++ b/rowers/opaque.py @@ -1,3 +1,8 @@ +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 2164b2cb..da548559 100644 --- a/rowers/ownapistuff.py +++ b/rowers/ownapistuff.py @@ -1,3 +1,7 @@ +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. diff --git a/rowers/payments.py b/rowers/payments.py index 1e4304fa..25f3e790 100644 --- a/rowers/payments.py +++ b/rowers/payments.py @@ -1,3 +1,7 @@ +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 d4d6d820..2d32add8 100644 --- a/rowers/permissions.py +++ b/rowers/permissions.py @@ -1,3 +1,7 @@ +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 76ffccd6..58c140df 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -1,4 +1,8 @@ -from __future__ import unicode_literals, absolute_import +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + # Python from django.utils import timezone from datetime import datetime diff --git a/rowers/plots.py b/rowers/plots.py index bdd216c1..ad61e922 100644 --- a/rowers/plots.py +++ b/rowers/plots.py @@ -1,3 +1,8 @@ +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 3793fa28..3057c59b 100644 --- a/rowers/polarstuff.py +++ b/rowers/polarstuff.py @@ -1,3 +1,8 @@ +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 needed to connect to Strava diff --git a/rowers/rows.py b/rowers/rows.py index faba7aee..9b6331d6 100644 --- a/rowers/rows.py +++ b/rowers/rows.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import time import gzip import shutil diff --git a/rowers/runkeeperstuff.py b/rowers/runkeeperstuff.py index 83f7060a..5f9cd15f 100644 --- a/rowers/runkeeperstuff.py +++ b/rowers/runkeeperstuff.py @@ -1,3 +1,7 @@ +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 needed to connect to Runkeeper from rowers.imports import * diff --git a/rowers/serializers.py b/rowers/serializers.py index 6ecef2a3..7a99f2a1 100644 --- a/rowers/serializers.py +++ b/rowers/serializers.py @@ -1,3 +1,8 @@ +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 191f8e01..186340e0 100644 --- a/rowers/sporttracksstuff.py +++ b/rowers/sporttracksstuff.py @@ -1,3 +1,8 @@ +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 diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index c8fc5e40..27b89390 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -1,3 +1,7 @@ +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 needed to connect to Strava diff --git a/rowers/tasks.py b/rowers/tasks.py index 3d33c34d..f0a9ebe2 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + """ Background tasks done by Celery (develop) or QR (production) """ from __future__ import absolute_import import os diff --git a/rowers/tasks_standalone.py b/rowers/tasks_standalone.py index c0d7da11..f20586c3 100644 --- a/rowers/tasks_standalone.py +++ b/rowers/tasks_standalone.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import os import sys import django diff --git a/rowers/teams.py b/rowers/teams.py index 36f07287..3dc3f310 100644 --- a/rowers/teams.py +++ b/rowers/teams.py @@ -1,3 +1,7 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals # All the Team related methods diff --git a/rowers/temp.py b/rowers/temp.py index 71fc7a26..234f2503 100644 --- a/rowers/temp.py +++ b/rowers/temp.py @@ -1,3 +1,7 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals # This is just a scratch pad to temporarily park code, just in case I need # it later. Hardly used since i have proper versioning diff --git a/rowers/tpstuff.py b/rowers/tpstuff.py index 442bd820..d436f5b5 100644 --- a/rowers/tpstuff.py +++ b/rowers/tpstuff.py @@ -1,3 +1,7 @@ +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 needed to connect to Runkeeper from rowers.imports import * diff --git a/rowers/traverselinktest.py b/rowers/traverselinktest.py index 75a22fd0..546a5ccf 100644 --- a/rowers/traverselinktest.py +++ b/rowers/traverselinktest.py @@ -1,3 +1,7 @@ +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 diff --git a/rowers/underarmourstuff.py b/rowers/underarmourstuff.py index cbe1db96..842134d5 100644 --- a/rowers/underarmourstuff.py +++ b/rowers/underarmourstuff.py @@ -1,3 +1,7 @@ +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 from rowers.imports import * diff --git a/rowers/uploads.py b/rowers/uploads.py index ae86ae2c..0e662e4e 100644 --- a/rowers/uploads.py +++ b/rowers/uploads.py @@ -1,3 +1,7 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals # for actions related to uploads from django.conf import settings from django.utils import timezone,translation diff --git a/rowers/urls.py b/rowers/urls.py index 60287e59..b7b67c0e 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -1,3 +1,7 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals from django.conf import settings from django.conf.urls import url, include from django.contrib.auth.models import User diff --git a/rowers/utils.py b/rowers/utils.py index 6b5484a8..d87fe162 100644 --- a/rowers/utils.py +++ b/rowers/utils.py @@ -1,3 +1,7 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals import math import numpy as np import pandas as pd diff --git a/rowers/weather.py b/rowers/weather.py index f6ece062..d50e84fc 100644 --- a/rowers/weather.py +++ b/rowers/weather.py @@ -1,3 +1,7 @@ +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 import requests import json