Added recompiled requirements.txt and some linting fixes

Author: dolfandringa

nbviewer/providers/__init__.py

@@ -83,7 +83,7 @@ def _load_provider_feature(feature, providers, **handler_names):
         try:
             # Ex: handler_names['url_handler']
             handler_names[provider_handler_key]
-        except KeyError:
+        except KeyError as e:
             continue
         else:
             # Ex: provider_handlers['url_handler'] = handler_names['url_handler']

nbviewer/providers/s3/handlers.py

@@ -9,8 +9,10 @@
 import os
 from datetime import datetime
 from urllib.parse import urlparse
+
 import boto3
 import botocore
+from tornado import iostream
 from tornado import web
 
 from .. import _load_handler_from_location
@@ -24,17 +26,17 @@ class S3Handler(RenderingHandler):
 
     Serving notebooks from S3 buckets
     """
+
     def initialize(self, **kwargs):
         self.s3_client = boto3.client("s3")
         self._downloadable_data = None
         self._downloaded_path = None
         super().initialize(**kwargs)
 
-
     async def download(self, path):
         """Download the notebook"""
         headers = await self.get_notebook_headers(path)
-        filename=os.path.basename(path)
+        filename = os.path.basename(path)
         self.set_header("Content-Length", headers["ContentLength"])
         # Escape commas to workaround Chrome issue with commas in download filenames
         self.set_header(
@@ -55,7 +57,6 @@ async def download(self, path):
             except iostream.StreamClosedError:
                 return
 
-
     async def get_notebook_data(self, path):
         """Get additional notebook data"""
         is_download = self.get_query_arguments("download")
@@ -65,7 +66,6 @@ async def get_notebook_data(self, path):
 
         return path
 
-
     async def get_notebook_headers(self, path):
         """Get the size of a notebook file."""
         o = urlparse(path)
@@ -81,7 +81,6 @@ async def get_notebook_headers(self, path):
             raise ex
         return head
 
-
     async def read_s3_file(self, path):
         """Download the notebook file from s3."""
         o = urlparse(path)
@@ -98,11 +97,10 @@ async def read_s3_file(self, path):
             raise ex
         s3_file.seek(0)
         self.log.debug("Done downloading.")
-        self._downloadable_data = s3_file.read().decode('utf-8')
+        self._downloadable_data = s3_file.read().decode("utf-8")
         self._downloaded_path = path
         return self._downloadable_data
 
-
     async def deliver_notebook(self, path):
         nbdata = await self.read_s3_file(path)
 
@@ -137,16 +135,15 @@ async def get(self, path):
             await self.deliver_notebook(fullpath)
 
 
-
 def default_handlers(handlers=[], **handler_names):
     """Tornado handlers"""
 
     s3_handler = _load_handler_from_location(handler_names["s3_handler"])
 
     return handlers + [(r"/(s3%3A//.*)", s3_handler, {})]
 
+
 def uri_rewrites(rewrites=[]):
     return [
         (r"^(s3://.*)$", "{0}"),
     ]
-

requirements.txt

@@ -20,6 +20,12 @@ beautifulsoup4==4.11.1
     # via nbconvert
 bleach==5.0.1
     # via nbconvert
+boto3==1.23.3
+    # via -r requirements.in
+botocore==1.26.3
+    # via
+    #   boto3
+    #   s3transfer
 certifi==2022.12.7
     # via elastic-transport
 cffi==1.15.1
@@ -48,6 +54,10 @@ jinja2==3.1.2
     # via
     #   jupyter-server
     #   nbconvert
+jmespath==1.0.0
+    # via
+    #   boto3
+    #   botocore
 jsonschema==4.17.0
     # via nbformat
 jupyter-client==7.4.4
@@ -130,11 +140,15 @@ pyparsing==3.0.9
 pyrsistent==0.19.2
     # via jsonschema
 python-dateutil==2.8.2
-    # via jupyter-client
+    # via
+    #   botocore
+    #   jupyter-client
 pyzmq==24.0.1
     # via
     #   jupyter-client
     #   jupyter-server
+s3transfer==0.5.2
+    # via boto3
 send2trash==1.8.0
     # via jupyter-server
 six==1.16.0
@@ -171,6 +185,8 @@ traitlets==5.5.0
     #   nbconvert
     #   nbformat
 urllib3==1.26.12
+    # via
+    #   botocore
     # via elastic-transport
 wcwidth==0.2.5
     # via prompt-toolkit