From 8b3e5796a26dd2490d7dcbda7a06ac64638c870a Mon Sep 17 00:00:00 2001 From: Martin Strobel Date: Fri, 24 May 2019 09:59:11 -0700 Subject: [PATCH 1/4] Increase version in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index f69bc89..ce287c8 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,7 @@ 'Development Status :: 2 - Pre-Alpha', ], install_requires=[ - 'msal~=0.3', + 'msal~=0.4', 'portalocker~=1.0', ], tests_require=['pytest'], From 2cab4153dcb0ca7fcdd2a82251cb446d0999b74b Mon Sep 17 00:00:00 2001 From: Martin Strobel Date: Fri, 24 May 2019 10:22:05 -0700 Subject: [PATCH 2/4] Replacing `remove_rt` and `update_rt` with `modify` --- msal_extensions/windows.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/msal_extensions/windows.py b/msal_extensions/windows.py index 528d51f..5af9481 100644 --- a/msal_extensions/windows.py +++ b/msal_extensions/windows.py @@ -157,7 +157,7 @@ def add(self, event, **kwargs): super(WindowsTokenCache, self).add(event, **kwargs) self._write() - def update_rt(self, rt_item, new_rt): + def modify(self, credential_type, old_entry, new_key_value_pairs=None): with CrossPlatLock(self._lock_location): if self._needs_refresh(): try: @@ -165,18 +165,7 @@ def update_rt(self, rt_item, new_rt): except IOError as exp: if exp.errno != errno.ENOENT: raise exp - super(WindowsTokenCache, self).update_rt(rt_item, new_rt) - self._write() - - def remove_rt(self, rt_item): - with CrossPlatLock(self._lock_location): - if self._needs_refresh(): - try: - self._read() - except IOError as exp: - if exp.errno != errno.ENOENT: - raise exp - super(WindowsTokenCache, self).remove_rt(rt_item) + super(WindowsTokenCache, self).modify(credential_type, old_entry, new_key_value_pairs) self._write() def find(self, credential_type, **kwargs): # pylint: disable=arguments-differ From 9664d6ba29b4bad43a4c32a755ad35848322e291 Mon Sep 17 00:00:00 2001 From: Martin Strobel Date: Fri, 24 May 2019 12:49:41 -0700 Subject: [PATCH 3/4] Making argument types consistent. --- msal_extensions/windows.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/msal_extensions/windows.py b/msal_extensions/windows.py index 5af9481..f386e12 100644 --- a/msal_extensions/windows.py +++ b/msal_extensions/windows.py @@ -165,7 +165,7 @@ def modify(self, credential_type, old_entry, new_key_value_pairs=None): except IOError as exp: if exp.errno != errno.ENOENT: raise exp - super(WindowsTokenCache, self).modify(credential_type, old_entry, new_key_value_pairs) + super(WindowsTokenCache, self).modify(credential_type, old_entry, new_key_value_pairs=new_key_value_pairs) self._write() def find(self, credential_type, **kwargs): # pylint: disable=arguments-differ From e11e6bcf9f92349bb65e4dc28d3c6eaa759129a5 Mon Sep 17 00:00:00 2001 From: Martin Strobel Date: Fri, 24 May 2019 12:54:25 -0700 Subject: [PATCH 4/4] Formatting fix for pylint --- msal_extensions/windows.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/msal_extensions/windows.py b/msal_extensions/windows.py index f386e12..0e529f1 100644 --- a/msal_extensions/windows.py +++ b/msal_extensions/windows.py @@ -165,7 +165,10 @@ def modify(self, credential_type, old_entry, new_key_value_pairs=None): except IOError as exp: if exp.errno != errno.ENOENT: raise exp - super(WindowsTokenCache, self).modify(credential_type, old_entry, new_key_value_pairs=new_key_value_pairs) + super(WindowsTokenCache, self).modify( + credential_type, + old_entry, + new_key_value_pairs=new_key_value_pairs) self._write() def find(self, credential_type, **kwargs): # pylint: disable=arguments-differ