passes checks in python3

rowers/imports.py

@@ -1,3 +1,4 @@
+from __future__ import unicode_literals, absolute_import
 # All the functionality to connect to SportTracks
 
 # Python
@@ -16,7 +17,7 @@ from dateutil import parser
 import time
 from time import strftime
 
-import dataprep
+import rowers.dataprep as dataprep
 import math
 from math import sin,cos,atan2,sqrt
 import os,sys
@@ -38,7 +39,7 @@ from django.contrib.auth.decorators import login_required
 from rowingdata import rowingdata, make_cumvalues
 import pandas as pd
 from rowers.models import Rower,Workout,checkworkoutuser
-from rowers import mytypes
+import rowers.mytypes as mytypes
 from rowsandall_app.settings import (
     C2_CLIENT_ID, C2_REDIRECT_URI, C2_CLIENT_SECRET,
     STRAVA_CLIENT_ID, STRAVA_REDIRECT_URI,
@@ -46,7 +47,7 @@ from rowsandall_app.settings import (
     SPORTTRACKS_CLIENT_ID, SPORTTRACKS_REDIRECT_URI
     )
 
-from utils import (
+from rowers.utils import (
     NoTokenError, custom_exception_handler, ewmovingaverage,
     geo_distance,isprorower,uniqify
     )
@@ -59,9 +60,9 @@ def splitstdata(lijst):
     t = []
     latlong = []
     while len(lijst)>=2:
-	t.append(lijst[0])
-	latlong.append(lijst[1])
-	lijst = lijst[2:]
+        t.append(lijst[0])
+        latlong.append(lijst[1])
+        lijst = lijst[2:]
 
     return [np.array(t),np.array(latlong)]
 
@@ -103,7 +104,6 @@ def imports_open(user,oauth_data):
                 oauth_data,
             )
         elif tokenexpirydate is None and expirydatename is not None and 'strava' in expirydatename:
-            print 'noot'
             token = imports_token_refresh(
                 user,
                 tokenname,
@@ -124,13 +124,13 @@ def imports_do_refresh_token(refreshtoken,oauth_data,access_token=''):
         )
 
     post_data = {"grant_type": "refresh_token",
-		 "client_secret": oauth_data['client_secret'],
-		 "client_id": oauth_data['client_id'],
-		 "refresh_token": refreshtoken,
-		 }
+                 "client_secret": oauth_data['client_secret'],
+                 "client_id": oauth_data['client_id'],
+                 "refresh_token": refreshtoken,
+                 }
     headers = {'user-agent': 'sanderroosendaal',
-	       'Accept': 'application/json',
-	       'Content-Type': oauth_data['content_type']}
+               'Accept': 'application/json',
+               'Content-Type': oauth_data['content_type']}
 
     # for Strava
     if 'grant_type' in oauth_data:
@@ -147,11 +147,11 @@ def imports_do_refresh_token(refreshtoken,oauth_data,access_token=''):
     if 'json' in oauth_data['content_type']:
         response = requests.post(baseurl,
                                  data=json.dumps(post_data),
-			         headers=headers)
+                                 headers=headers)
     else:
         response = requests.post(baseurl,
                                  data=post_data,
-			         headers=headers)
+                                 headers=headers)
 
 
         
@@ -174,9 +174,9 @@ def imports_do_refresh_token(refreshtoken,oauth_data,access_token=''):
         except KeyError:
             expires_in = 0
     try:
-	refresh_token = token_json['refresh_token']
+        refresh_token = token_json['refresh_token']
     except KeyError:
-	refresh_token = refreshtoken
+        refresh_token = refreshtoken
     try:
         expires_in = int(expires_in)
     except (TypeError,ValueError):
@@ -204,16 +204,16 @@ def imports_get_token(
     post_data = {"grant_type": "authorization_code",
                  "code": code,
                  "redirect_uri": redirect_uri,
-		 "client_secret": client_secret,
-		 "client_id": client_id,
-		 }
+                 "client_secret": client_secret,
+                 "client_id": client_id,
+                 }
     
     try:
         headers = oauth_data['headers']
     except KeyError:
         headers = {'Accept': 'application/json',
                    'Api-Key': client_id,
-	           'Content-Type': 'application/json',
+                   'Content-Type': 'application/json',
                    'user-agent': 'sanderroosendaal'}
 
     if 'grant_type' in oauth_data:
@@ -229,12 +229,12 @@ def imports_get_token(
         response = requests.post(
             base_uri,
             data=json.dumps(post_data),
-	    headers=headers)
+            headers=headers)
     else:
         response = requests.post(
             base_uri,
             data=post_data,
-	    headers=headers)
+            headers=headers)
 
     if response.status_code == 200 or response.status_code == 201:
         token_json = response.json()
@@ -243,9 +243,9 @@ def imports_get_token(
         except KeyError:
             return [0,0,0]
         try:
-	    refresh_token = token_json['refresh_token']
+            refresh_token = token_json['refresh_token']
         except KeyError:
-	    refresh_token = ''
+            refresh_token = ''
         try:
             expires_in = token_json['expires_in']
         except KeyError:
@@ -270,8 +270,8 @@ def imports_make_authorization_url(oauth_data):
     params = {"client_id": oauth_data['client_id'],
               "response_type": "code",
               "redirect_uri": oauth_data['redirect_uri'],
-	      "scope":oauth_data['scope'],
-	      "state":state}
+              "scope":oauth_data['scope'],
+              "state":state}
 
 
     import urllib