more pep

rowers/nkstuff.py

@@ -31,13 +31,6 @@ queue = django_rq.get_queue('default')
 queuelow = django_rq.get_queue('low')
 queuehigh = django_rq.get_queue('low')
 
-
-try:
-    from json.decoder import JSONDecodeError
-except ImportError:  # pragma: no cover
-    JSONDecodeError = ValueError
-
-
 oauth_data = {
     'client_id': NK_CLIENT_ID,
     'client_secret': NK_CLIENT_SECRET,
@@ -56,12 +49,6 @@ oauth_data = {
 def get_token(code):  # pragma: no cover
     url = oauth_data['base_url']
 
-    headers = {'Accept': 'application/json',
-               # 'Authorization': auth_header,
-               'Content-Type': 'application/x-www-form-urlencoded',
-               # 'user-agent': 'sanderroosendaal'
-               }
-
     post_data = {"client_id": oauth_data['client_id'],
                  "grant_type": "authorization_code",
                  "redirect_uri": oauth_data['redirect_uri'],
@@ -88,13 +75,12 @@ def nk_open(user):
     r = Rower.objects.get(user=user)
 
     if (r.nktoken == '') or (r.nktoken is None):  # pragma: no cover
-        s = "Token doesn't exist. Need to authorize"
         raise NoTokenError("User has no token")
     else:
         if (timezone.now() > r.nktokenexpirydate):
 
             thetoken = rower_nk_token_refresh(user)
-            if thetoken == None:  # pragma: no cover
+            if thetoken is None:  # pragma: no cover
                 raise NoTokenError("User has no token")
             return thetoken
         else:
@@ -105,7 +91,7 @@ def nk_open(user):
 
 def get_nk_workouts(rower, do_async=True, before=0, after=0):
     try:
-        thetoken = nk_open(rower.user)
+        _ = nk_open(rower.user)
     except NoTokenError:  # pragma: no cover
         return 0
 
@@ -136,7 +122,7 @@ def get_nk_workouts(rower, do_async=True, before=0, after=0):
         pass
 
     knownnkids = uniqify(knownnkids+tombstones+parkedids)
-    newids = [nkid for nkid in nkids if not nkid in knownnkids]
+    newids = [nkid for nkid in nkids if nkid not in knownnkids]
     s = 'New NK IDs {newids}'.format(newids=newids)
     dologging('nklog.log', s)
 
@@ -211,7 +197,8 @@ def get_nk_workout_list(user, fake=False, after=0, before=0):
     if (r.nktoken == '') or (r.nktoken is None):  # pragma: no cover
         s = "Token doesn't exist. Need to authorize"
         return custom_exception_handler(401, s)
-    elif (r.nktokenexpirydate is None or timezone.now()+timedelta(seconds=10) > r.nktokenexpirydate):  # pragma: no cover
+    elif (r.nktokenexpirydate is None or
+            timezone.now()+timedelta(seconds=10) > r.nktokenexpirydate):  # pragma: no cover
         s = "Token expired. Needs to refresh."
         return custom_exception_handler(401, s)
     else:
@@ -251,10 +238,6 @@ def get_workout(user, nkid, do_async=True, startdate='', enddate=''):
         s = "Token expired. Needs to refresh."
         return custom_exception_handler(401, s), 0
 
-    params = {
-        'sessionIds': nkid,
-    }
-
     before = 0
     after = 0
     if startdate:  # pragma: no cover