Skip to content

Commit 0e5b5d5

Browse files
committed
Address some comments
1 parent 0757501 commit 0e5b5d5

File tree

3 files changed

+9
-12
lines changed

3 files changed

+9
-12
lines changed

azure/datalake/store/core.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class AzureDLFileSystem(object):
4343
Parameters
4444
----------
4545
store_name: str ("")
46-
Store name to connect to.
46+
Store name to connect to. If not supplied, we use environment variable azure_data_lake_store_name
4747
token_credential: credentials object
4848
When setting up a new connection, this contains the authorization
4949
credentials. Use Azure Identity to get this or define an implementation of azure.core.credentials.TokenCredential
@@ -61,10 +61,9 @@ class AzureDLFileSystem(object):
6161
"""
6262
_singleton = [None]
6363

64-
def __init__(self, token_credential=None, per_call_timeout_seconds=60, **kwargs):
64+
def __init__(self, token_credential=None, **kwargs):
6565
self.token_credential = token_credential
6666
self.kwargs = kwargs
67-
self.per_call_timeout_seconds = per_call_timeout_seconds
6867
self.connect()
6968
self.dirs = {}
7069
self._emptyDirs = []
@@ -83,7 +82,7 @@ def connect(self):
8382
"""
8483
Establish connection object.
8584
"""
86-
self.azure = DatalakeRESTInterface(token_credential=self.token_credential, req_timeout_s=self.per_call_timeout_seconds, **self.kwargs)
85+
self.azure = DatalakeRESTInterface(token_credential=self.token_credential, **self.kwargs)
8786
self.token_credential = self.azure.token_credential
8887

8988
def __setstate__(self, state):

azure/datalake/store/lib.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ class DatalakeRESTInterface:
119119
'REMOVEDEFAULTACL': ('put', set(), set())
120120
}
121121

122-
def __init__(self, store_name=default_store, token_credential=None,
123-
url_suffix=default_adls_suffix, api_version='2018-09-01', req_timeout_s=60, scopes=None):
122+
def __init__(self, store_name=default_store, token_credential=None, scopes=None, url_suffix=default_adls_suffix, **kwargs):
124123
# in the case where an empty string is passed for the url suffix, it must be replaced with the default.
125124
url_suffix = url_suffix or default_adls_suffix
126125
self.local = threading.local()
@@ -130,7 +129,9 @@ def __init__(self, store_name=default_store, token_credential=None,
130129

131130
# There is a case where the user can opt to exclude an API version, in which case
132131
# the service itself decides on the API version to use (it's default).
133-
self.api_version = api_version or None
132+
self.api_version = kwargs.pop('api_version', '2018-09-01')
133+
self.req_timeout_s = kwargs.pop('req_timeout_s', 60)
134+
134135
self.url = 'https://%s.%s/' % (store_name, url_suffix)
135136

136137
self.webhdfs = 'webhdfs/v1/'
@@ -140,7 +141,6 @@ def __init__(self, store_name=default_store, token_credential=None,
140141
platform.platform(),
141142
__name__,
142143
__version__)
143-
self.req_timeout_s = req_timeout_s
144144

145145
def get_refreshed_bearer_token(self):
146146
# Check if the token is about to expire in 300 seconds and refresh it if necessary

setup.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,9 @@
4141
]),
4242
install_requires=[
4343
'cffi',
44-
'requests>=2.20.0',
45-
'azure-identity',
44+
'requests>=2.20.0'
4645
],
47-
extras_require={
48-
},
46+
extras_require={ 'auth': ['azure-identity']},
4947
long_description=readme + '\n\n' + history,
5048
zip_safe=False,
5149
)

0 commit comments

Comments
 (0)