Merge branch 'release/v20.1.34'

rowers/dataroutines.py

@@ -1002,7 +1002,10 @@ def parsenonpainsled(fileformat, f2, summary, startdatetime='', empowerfirmware=
             else:
                 row = NKLiNKLogbookParser(f2)
         else:
-            row = parsers[fileformat](f2)
+            try:
+                row = parsers[fileformat](f2)
+            except:
+                return None, hasrecognized, '', 'unknown'
         if startdatetime != '':  # pragma: no cover
             row.rowdatetime = arrow.get(startdatetime).datetime
         hasrecognized = True

rowers/integrations/strava.py

@@ -12,6 +12,7 @@ from rowers.utils import get_strava_stream
 from rowers.utils import myqueue, dologging
 #from rowers.imports import *
 
+import urllib
 import gzip
 import time
 import requests

rowsandall_app/settings.py

@@ -8,6 +8,8 @@ https://docs.djangoproject.com/en/1.9/topics/settings/
 
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.9/ref/settings/
+
+deliver erosion ivory chief exotic boring tackle auto print crawl lazy false
 """
 # -*- coding: utf-8 -*-
 import os