numerous fixes from testing, all automated tests pass

oduwsdl · Jun 13, 2019 · 78d2f361013a44f1c5b0a85bbc1ecf5c09d6ad1f · 78d2f36
1 parent 4d2651c
commit 78d2f361013a44f1c5b0a85bbc1ecf5c09d6ad1f
Unified Split

Showing with 179 additions and 183 deletions.

+2 −2 mementoembed/__init__.py

+149 −179 mementoembed/imageselection.py

+2 −0 setup.py

+1 −1 tests/integration/battery_data.csv

+25 −1 tests/unit/test_imageselection.py
diff --git a/mementoembed/__init__.py b/mementoembed/__init__.py
@@ -70,7 +70,7 @@ def getURICache(urim):
            expire_after=int(current_app.config['URICACHE_EXPIRATION']),
            old_data_on_error=True,
            connection=conn,
-  
-            timeout=current_app.config['REQUEST_TIMEOUT_FLOAT'],
+  
+            timeout=current_app.config['REQUEST_TIMEOUT'],
            user_agent=__useragent__,
            starting_uri=urim
        )
@@ -87,7 +87,7 @@ def getURICache(urim):
        return ManagedSession(
            cache_name=cachename,
            extension=ext,
-  
-            timeout=current_app.config['REQUEST_TIMEOUT_FLOAT'],
+  
+            timeout=current_app.config['REQUEST_TIMEOUT'],
            user_agent=__useragent__,
            starting_uri=urim
        )