Skip to content

Commit 96c064b

Browse files
committed
Sync with master
1 parent 34e415d commit 96c064b

File tree

3 files changed

+4
-9
lines changed

3 files changed

+4
-9
lines changed

azure/datalake/store/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
__version__ = "0.0.37"
1010

1111

12-
1312
from .core import AzureDLFileSystem
1413
from .multithread import ADLDownloader
1514

azure/datalake/store/lib.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ def get_token_internal():
135135
code = context.acquire_user_code(resource, client_id)
136136
print(code['message'])
137137
out = context.acquire_token_with_device_code(resource, code, client_id)
138-
139138
elif username and password:
140139
out = context.acquire_token_with_username_password(resource, username,
141140
password, client_id)
@@ -147,8 +146,8 @@ def get_token_internal():
147146
else:
148147
raise ValueError("No authentication method found for credentials")
149148
return out
150-
151149
out = get_token_internal()
150+
152151
out.update({'access': out['accessToken'], 'resource': resource,
153152
'refresh': out.get('refreshToken', False),
154153
'time': time.time(), 'tenant': tenant_id, 'client': client_id})
@@ -161,22 +160,22 @@ class DataLakeCredential:
161160
def __init__(self, token):
162161
self.token = token
163162

164-
def signed_session(self, retry_policy=None):
163+
def signed_session(self):
165164
# type: () -> requests.Session
166165
"""Create requests session with any required auth headers applied.
167166
168167
:rtype: requests.Session
169168
"""
170169
session = requests.Session()
171170
if time.time() - self.token['time'] > self.token['expiresIn'] - 100:
172-
self.refresh_token(retry_poliy=retry_policy)
171+
self.refresh_token()
173172

174173
scheme, token = self.token['tokenType'], self.token['access']
175174
header = "{} {}".format(scheme, token)
176175
session.headers['Authorization'] = header
177176
return session
178177

179-
def refresh_token(self, authority=None, retry_policy=None):
178+
def refresh_token(self, authority=None):
180179
""" Refresh an expired authorization token
181180
182181
Parameters
@@ -294,7 +293,6 @@ def session(self):
294293
self.local.session = s
295294
return s
296295

297-
298296
def _check_token(self, retry_policy= None):
299297
@retry_decorator_for_auth(retry_policy=retry_policy)
300298
def check_token_internal():

azure/datalake/store/retry.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ def deco_retry(func):
8686
@wraps(func)
8787
def f_retry(*args, **kwargs):
8888
retry_count = -1
89-
9089
while True:
9190
last_exception = None
9291
retry_count += 1
@@ -108,7 +107,6 @@ def f_retry(*args, **kwargs):
108107
if last_exception is not None:
109108
raise last_exception
110109
return out
111-
112110
return f_retry
113111

114112
return deco_retry

0 commit comments

Comments
 (0)