removing some duplicate code

rowers/underarmourstuff.py

@@ -39,63 +39,18 @@ from rowsandall_app.settings import (
     UNDERARMOUR_REDIRECT_URI,UNDERARMOUR_CLIENT_KEY,
     )
 
-# Custom error class - to raise a NoTokenError
-class UnderArmourNoTokenError(Exception):
-    def __init__(self,value):
-	self.value=value
+from utils import NoTokenError,ewmovingaverage
 
-    def __str__(self):
-	return repr(self.value)
-
-    # Exponentially weighted moving average
-# Used for data smoothing of the jagged data obtained by Strava
-# See bitbucket issue 72
-def ewmovingaverage(interval,window_size):
-    # Experimental code using Exponential Weighted moving average
-
-    try:
-        intervaldf = pd.DataFrame({'v':interval})
-        idf_ewma1 = intervaldf.ewm(span=window_size)
-        idf_ewma2 = intervaldf[::-1].ewm(span=window_size)
-        
-        i_ewma1 = idf_ewma1.mean().ix[:,'v']
-        i_ewma2 = idf_ewma2.mean().ix[:,'v']
-
-        interval2 = np.vstack((i_ewma1,i_ewma2[::-1]))
-        interval2 = np.mean( interval2, axis=0) # average
-    except ValueError:
-        interval2 = interval
-
-    return interval2
-
-from utils import geo_distance
+from utils import geo_distance, custom_exception_handler
 
 
-# Custom exception handler, returns a 401 HTTP message
-# with exception details in the json data
-def custom_exception_handler(exc,message):
-
-    response = {
-	"errors": [
-	    {
-		"code": str(exc),
-		"detail": message,
-		}
-	    ]
-	}
-
-    res = HttpResponse(message)
-    res.status_code = 401
-    res.json = json.dumps(response)
-
-    return res
 
 # Checks if user has UnderArmour token, renews them if they are expired
 def underarmour_open(user):
     r = Rower.objects.get(user=user)
     if (r.underarmourtoken == '') or (r.underarmourtoken is None):
 	s = "Token doesn't exist. Need to authorize"
-	raise UnderArmourNoTokenError("User has no token")
+	raise NoTokenError("User has no token")
     else:
 	if (timezone.now()>r.underarmourtokenexpirydate):
             res = do_refresh_token(