Dependency updates (msal msal), examples minor fixes, safe urlparse (compat)

Author: [email protected]

examples/requirements.txt

@@ -1,3 +1,2 @@
-msal~=1.5.0
 Faker~=4.1.2
 adal~=1.2.4

examples/sharepoint/connect_with_client_certificate.py

@@ -1,16 +1,16 @@
 import os
 from office365.sharepoint.client_context import ClientContext
-from tests import settings
+from tests import test_site_url, test_tenant
 
 cert_settings = {
     'client_id': '51d03106-4726-442c-86db-70b32fa7547f',
     'thumbprint': "6B36FBFC86FB1C019EB6496494B9195E6D179DDB",
     'certificate_path': '{0}/selfsigncert.pem'.format(os.path.dirname(__file__))
 }
 
-ctx = ClientContext(settings.get('default', 'url')).with_client_certificate(settings.get('default', 'tenant'),
-                                                                            cert_settings.get('client_id'),
-                                                                            cert_settings.get('thumbprint'),
-                                                                            cert_settings.get('certificate_path'))
+ctx = ClientContext(test_site_url).with_client_certificate(test_tenant,
+                                                           cert_settings.get('client_id'),
+                                                           cert_settings.get('thumbprint'),
+                                                           cert_settings.get('certificate_path'))
 current_web = ctx.web.get().execute_query()
 print("{0}".format(current_web.url))

office365/runtime/auth/providers/acs_token_provider.py

@@ -3,6 +3,7 @@
 import office365.logger
 from office365.runtime.auth.authentication_provider import AuthenticationProvider
 from office365.runtime.auth.token_response import TokenResponse
+from office365.runtime.compat import urlparse
 
 
 class ACSTokenProvider(AuthenticationProvider, office365.logger.LoggerContext):
@@ -38,10 +39,6 @@ def ensure_app_only_access_token(self):
     def get_app_only_access_token(self):
         try:
             realm = self._get_realm_from_target_url()
-            try:
-                from urlparse import urlparse  # Python 2.X
-            except ImportError:
-                from urllib.parse import urlparse  # Python 3+
             url_info = urlparse(self.url)
             return self._get_app_only_access_token(url_info.hostname, realm)
         except requests.exceptions.RequestException as e:

office365/runtime/auth/sts_profile.py

@@ -1,6 +1,6 @@
 import datetime
-from datetime import datetime, timezone, timedelta
-from urllib.parse import urlparse
+from datetime import datetime, timedelta
+from office365.runtime.compat import urlparse, timezone
 
 
 class STSProfile(object):

office365/runtime/compat.py

@@ -0,0 +1,23 @@
+import sys
+
+# -------
+# Pythons
+# -------
+
+# Syntax sugar.
+_ver = sys.version_info
+
+#: Python 2.x?
+is_py2 = (_ver[0] == 2)
+
+#: Python 3.x?
+is_py3 = (_ver[0] == 3)
+
+if is_py2:
+    from urlparse import urlparse
+    import pytz as timezone
+elif is_py3:
+    from urllib.parse import urlparse
+    from datetime import timezone
+
+

office365/sharepoint/folders/folder.py

@@ -1,4 +1,3 @@
-from urllib.parse import urlparse
 from office365.runtime.client_result import ClientResult
 from office365.runtime.queries.create_entity_query import CreateEntityQuery
 from office365.runtime.queries.service_operation_query import ServiceOperationQuery
@@ -16,6 +15,7 @@
 from office365.sharepoint.utilities.move_copy_options import MoveCopyOptions
 from office365.sharepoint.utilities.move_copy_util import MoveCopyUtil
 from office365.sharepoint.types.resource_path import ResourcePath as SPResPath
+from office365.runtime.compat import urlparse
 
 
 class Folder(BaseEntity):

requirements.txt

@@ -1,5 +1,5 @@
 requests==2.25.1
 requests_ntlm [NTLMAuthentication]
-setuptools==54.2.0
-msal==1.5.1
+setuptools==57.0.0
+msal==1.12.0
 pytz==2021.1