Applied minor changes to azure PR

papermill/abs.py

@@ -2,8 +2,6 @@
 import re
 import io
 
-from six.moves import urllib
-
 from azure.storage.blob import BlobServiceClient
 
 
@@ -19,9 +17,6 @@ class AzureBlobStore(object):
         - write
     """
 
-    def __init__(self):
-        pass
-
     def _blob_service_client(self, account_name, sas_token):
 
         blob_service_client = BlobServiceClient(
@@ -46,7 +41,7 @@ def _split_url(self, url):
                 "account": match.group(1),
                 "container": match.group(2),
                 "blob": match.group(3),
-                "sas_token": urllib.parse.unquote_plus(match.group(4)),
+                "sas_token": match.group(4),
             }
             return params
 

papermill/iorw.py

@@ -85,11 +85,11 @@ def read(self, path, extensions=['.ipynb', '.json']):
         if path == '-':
             return sys.stdin.read()
 
-        if not fnmatch.fnmatch(os.path.basename(path), '*.*'):
+        if not fnmatch.fnmatch(os.path.basename(path).split('?')[0], '*.*'):
             warnings.warn(
                 "the file is not specified with any extension : " + os.path.basename(path)
             )
-        elif not any(fnmatch.fnmatch(os.path.basename(path), '*' + ext) for ext in extensions):
+        elif not any(fnmatch.fnmatch(os.path.basename(path).split('?')[0], '*' + ext) for ext in extensions):
             warnings.warn(
                 "The specified input file ({}) does not end in one of {}".format(path, extensions)
             )
@@ -110,11 +110,11 @@ def write(self, buf, path, extensions=['.ipynb', '.json']):
                 return sys.stdout.write(buf.encode('utf-8'))
 
         # Usually no return object here
-        if not fnmatch.fnmatch(os.path.basename(path), '*.*'):
+        if not fnmatch.fnmatch(os.path.basename(path).split('?')[0], '*.*'):
             warnings.warn(
                 "the file is not specified with any extension : " + os.path.basename(path)
             )
-        elif not any(fnmatch.fnmatch(os.path.basename(path), '*' + ext) for ext in extensions):
+        elif not any(fnmatch.fnmatch(os.path.basename(path).split('?')[0], '*' + ext) for ext in extensions):
             warnings.warn(
                 "The specified input file ({}) does not end in one of {}".format(path, extensions)
             )

requirements-azure.txt

@@ -1,3 +1,3 @@
 azure-datalake-store >= 0.0.30
-azure-storage-blob
+azure-storage-blob >= 12.1.0
 requests >= 2.21.0