Restore suppprt for 2.7 and resolve compatibility errors

Author: [email protected]

.travis.yml

@@ -1,8 +1,8 @@
 language: python
 os: linux
 python:
+- '2.7'
 - '3.6'
-- '3.8'
 - '3.9'
 install:
 - pip install -r requirements.txt

examples/directory/delete_groups.py

@@ -3,7 +3,7 @@
 
 client = GraphClient(acquire_token_by_username_password)
 
-groups = client.groups.get().top(50).execute_query()
+groups = client.groups.get().top(10).execute_query()
 deletedCount = 0
 groups_count = len(groups)
 while len(groups) > 0:

examples/sharepoint/files/upload_large_file.py

@@ -1,7 +1,7 @@
 import os
 
 from office365.sharepoint.client_context import ClientContext
-from tests import test_site_url, test_user_credentials, test_team_site_url
+from tests import test_user_credentials, test_team_site_url
 
 ctx = ClientContext(test_team_site_url).with_credentials(test_user_credentials)
 
@@ -15,7 +15,7 @@
 
 
 def print_upload_progress(offset):
-    print("Uploaded '{}' bytes from '{}'...[{}%]".format(offset, file_size, round(offset / file_size * 100, 2)))
+    print("Uploaded '{0}' bytes from '{1}'...[{2}%]".format(offset, file_size, round(offset / file_size * 100, 2)))
 
 
 uploaded_file = target_folder.files.create_upload_session(local_path, size_chunk, print_upload_progress).execute_query()

generator/templates/complex_type.py

@@ -2,6 +2,4 @@
 
 
 class ComplexType(ClientValue):
-
-    def __init__(self):
-        super().__init__()
+    pass

office365/calendar/attendee.py

@@ -14,6 +14,6 @@ def __init__(self, emailAddress=EmailAddress(), attendee_type=None, proposedNewT
         :param str status: The attendee's response (none, accepted, declined, etc.) for the event and date-time
             that the response was sent.
         """
-        super().__init__(emailAddress, attendee_type)
+        super(Attendee, self).__init__(emailAddress, attendee_type)
         self.proposedNewTime = proposedNewTime
         self.status = status

office365/calendar/attendeeBase.py

@@ -11,5 +11,5 @@ def __init__(self, emailAddress, attendee_type=None):
         :param str attendee_type: The type of attendee. The possible values are: required, optional, resource.
             Currently if the attendee is a person, findMeetingTimes always considers the person is of the Required type.
         """
-        super().__init__(emailAddress)
+        super(AttendeeBase, self).__init__(emailAddress)
         self.type = attendee_type

office365/calendar/dateTimeTimeZone.py

@@ -12,7 +12,7 @@ def __init__(self, dateTime, timeZone=None):
         :param str dateTime: A single point of time in a combined date and time representation ({date}T{time};
             for example, 2017-08-29T04:00:00.0000000).
         """
-        super().__init__()
+        super(DateTimeTimeZone, self).__init__()
         self.dateTime = dateTime
         self.timeZone = timeZone
 

office365/calendar/emailAddress.py

@@ -5,6 +5,6 @@ class EmailAddress(ClientValue):
     """The name and email address of a contact or message recipient."""
 
     def __init__(self, address=None, name=None):
-        super().__init__()
+        super(EmailAddress, self).__init__()
         self.address = address
         self.name = name

office365/calendar/meeting_time_suggestions_result.py

@@ -17,7 +17,7 @@ def __init__(self, meetingTimeSuggestions=None,
             organizerUnavailable, or unknown. This property is an empty string if the meetingTimeSuggestions property
             does include any meeting suggestions.
         """
-        super().__init__()
+        super(MeetingTimeSuggestionsResult, self).__init__()
         self.meetingTimeSuggestions = ClientValueCollection(MeetingTimeSuggestion) if meetingTimeSuggestions is None \
             else meetingTimeSuggestions
         self.emptySuggestionsReason = emptySuggestionsReason

office365/calendar/reminder.py

@@ -9,5 +9,5 @@ def __init__(self, eventId=None):
 
         :param str eventId: The unique ID of the event. Read only.
         """
-        super().__init__()
+        super(Reminder, self).__init__()
         self.eventId = eventId

office365/calendar/schedule_information.py

@@ -23,7 +23,7 @@ def __init__(self, scheduleId=None, scheduleItems=None, availabilityView=None, e
         :param str scheduleId: An SMTP address of the user, distribution list, or resource, identifying an instance
             of scheduleInformation.
         """
-        super().__init__()
+        super(ScheduleInformation, self).__init__()
         self.scheduleItems = ClientValueCollection(ScheduleItem) if scheduleItems is None else scheduleItems
         self.scheduleId = scheduleId
         self.availabilityView = availabilityView

office365/calendar/timeSlot.py

@@ -10,6 +10,6 @@ def __init__(self, start, end):
         :param datetime.datetime start: The date, time, and time zone that a period begins.
         :param datetime.datetime end: The date, time, and time zone that a period ends.
         """
-        super().__init__()
+        super(TimeSlot, self).__init__()
         self.start = start
         self.end = end

office365/directory/assignedLicense.py

@@ -4,6 +4,6 @@
 class AssignedLicense(ClientValue):
 
     def __init__(self, skuId=None, disabledPlans=None):
-        super().__init__()
+        super(AssignedLicense, self).__init__()
         self.skuId = skuId
         self.disabledPlans = disabledPlans

office365/directory/passwordCredential.py

@@ -6,7 +6,7 @@ class PasswordCredential(ClientValue):
     The passwordCredentials property of the application entity is a collection of passwordCredential objects."""
 
     def __init__(self, displayName=None, keyId=None):
-        super().__init__()
+        super(PasswordCredential, self).__init__()
         self.displayName = displayName
         self.secretText = None
         self.keyId = keyId

office365/directory/servicePlanInfo.py

@@ -22,7 +22,7 @@ def __init__(self, servicePlanId=None, servicePlanName=None, provisioningStatus=
         :param str servicePlanName: The name of the service plan.
         :param str servicePlanId: The unique identifier of the service plan.
         """
-        super().__init__()
+        super(ServicePlanInfo, self).__init__()
         self.servicePlanId = servicePlanId
         self.servicePlanName = servicePlanName
         self.provisioningStatus = provisioningStatus

office365/directory/userIdentity.py

@@ -4,7 +4,7 @@
 class UserIdentity(ClientValue):
 
     def __init__(self):
-        super().__init__()
+        super(UserIdentity, self).__init__()
         self.displayName = None
         self.ipAddress = None
         self.userPrincipalName = None

office365/mail/itemBody.py

@@ -10,6 +10,6 @@ def __init__(self, content, contentType="Text"):
         :type content: str
         :type contentType: str
         """
-        super().__init__()
+        super(ItemBody, self).__init__()
         self.content = content
         self.contentType = contentType

office365/mail/location.py

@@ -9,5 +9,5 @@ def __init__(self, displayName=None):
 
         :param str displayName: The name associated with the location.
         """
-        super().__init__()
+        super(Location, self).__init__()
         self.displayName = displayName

office365/mail/recipient.py

@@ -11,14 +11,14 @@ def __init__(self, emailAddress=EmailAddress()):
 
         :param EmailAddress emailAddress: The recipient's email address.
         """
-        super().__init__()
+        super(Recipient, self).__init__()
         self.emailAddress = emailAddress
 
 
 class RecipientCollection(ClientValueCollection):
 
     def __init__(self, default_values=None):
-        super().__init__(Recipient, default_values)
+        super(RecipientCollection,self).__init__(Recipient, default_values)
 
     @staticmethod
     def from_emails(values):

office365/onedrive/driveItemUploadableProperties.py

@@ -5,7 +5,7 @@ class DriveItemUploadableProperties(ClientValue):
     """The driveItemUploadableProperties resource represents an item being uploaded when creating an upload session."""
 
     def __init__(self):
-        super().__init__()
+        super(DriveItemUploadableProperties, self).__init__()
         self.fileSystemInfo = None
         self.name = None
         self.description = None

office365/onedrive/file_upload.py

@@ -28,7 +28,7 @@ def __init__(self, target_folder, source_path, chunk_size=1024, chunk_uploaded=N
         :type source_path: str
         :type chunk_size: int
         """
-        super().__init__(target_folder, os.path.basename(source_path), "")
+        super(ResumableFileUpload, self).__init__(target_folder, os.path.basename(source_path), "")
         self._chunk_size = chunk_size
         self._source_path = source_path
         self._file_name = os.path.basename(self._source_path)

office365/onedrive/uploadSession.py

@@ -6,7 +6,7 @@ class UploadSession(ClientValue):
     Business, or SharePoint document libraries. """
 
     def __init__(self):
-        super().__init__()
+        super(UploadSession,self).__init__()
         self.expirationDateTime = None
         self.nextExpectedRanges = None
         self.uploadUrl = None

office365/runtime/auth/authentication_context.py

@@ -1,5 +1,3 @@
-import msal
-
 from office365.runtime.auth.client_credential import ClientCredential
 from office365.runtime.auth.providers.acs_token_provider import ACSTokenProvider
 from office365.runtime.auth.providers.oauth_token_provider import OAuthTokenProvider
@@ -30,8 +28,9 @@ def with_client_certificate(self, tenant, client_id, thumbprint, cert_path):
 
         def _acquire_token_for_client_certificate():
             authority_url = 'https://login.microsoftonline.com/{0}'.format(tenant)
-            scopes = [f"{self.url}/.default"]
+            scopes = ["{url}/.default".format(url=self.url)]
             credentials = {"thumbprint": thumbprint, "private_key": open(cert_path).read()}
+            import msal
             app = msal.ConfidentialClientApplication(
                 client_id,
                 authority=authority_url,

office365/runtime/auth/token_response.py

@@ -12,13 +12,15 @@ def is_valid(self):
 
     @staticmethod
     def from_json(value):
+        error = value.get('error', None)
+        if error:
+            raise ValueError(value)
 
         def _normalize_key(name):
             key_parts = name.split("_")
             if len(key_parts) >= 2:
                 names = [n.title() for n in key_parts[1:]]
                 return key_parts[0] + "".join(names)
             return name
-
         json = {_normalize_key(k): v for k, v in value.items()}
         return TokenResponse(**json)

office365/runtime/client_value_collection.py

@@ -9,7 +9,7 @@ def __init__(self, item_type, initial_values=None):
         :type item_type: any
         :type initial_values: any
         """
-        super().__init__()
+        super(ClientValueCollection, self).__init__()
         if initial_values is None:
             initial_values = []
         self._data = initial_values

office365/runtime/compat.py

@@ -15,9 +15,27 @@
 
 if is_py2:
     from urlparse import urlparse
+    from urllib import quote
+    from urlparse import urljoin
     import pytz as timezone
+    from email import message_from_string as message_from_bytes_or_string
 elif is_py3:
     from urllib.parse import urlparse
+    from urllib.parse import quote
+    from urllib.parse import urljoin
     from datetime import timezone
+    from email import message_from_bytes as message_from_bytes_or_string
 
 
+def message_as_bytes_or_string(message):
+    if is_py2:
+        return message.as_string()
+    else:
+        return message.as_bytes()
+
+
+def is_string_type(value):
+    if is_py2:
+        return isinstance(value, basestring)
+    else:
+        return type(value) is str

office365/runtime/odata/odata_batch_request.py

@@ -1,6 +1,6 @@
 import json
 import re
-from email import message_from_bytes
+from office365.runtime.compat import message_from_bytes_or_string, message_as_bytes_or_string
 from email.message import Message
 
 from office365.runtime.client_request import ClientRequest
@@ -25,7 +25,7 @@ def build_request(self, query):
         media_type = "multipart/mixed"
         content_type = "; ".join([media_type, "boundary={0}".format(query.current_boundary)])
         request.ensure_header('Content-Type', content_type)
-        request.data = self._prepare_payload(query).as_bytes()
+        request.data = self._prepare_payload(query)
         return request
 
     def process_response(self, response, query):
@@ -54,7 +54,7 @@ def _read_response(self, response):
             + response.content
         )
 
-        message = message_from_bytes(http_body)  # type: Message
+        message = message_from_bytes_or_string(http_body)  # type: Message
         for raw_response in message.get_payload():
             if raw_response.get_content_type() == "application/http":
                 yield self._deserialize_response(raw_response)
@@ -85,7 +85,7 @@ def _prepare_payload(self, query):
             message = self._serialize_request(request)
             main_message.attach(message)
 
-        return main_message
+        return message_as_bytes_or_string(main_message)
 
     @staticmethod
     def _normalize_headers(headers_raw):
@@ -114,7 +114,9 @@ def _deserialize_response(self, raw_response):
                 "content": None
             }
         else:
-            *headers_raw, content = lines[1:]
+            #*headers_raw, content = lines[1:]
+            headers_raw = lines[1:-1]
+            content = lines[-1]
             content = json.loads(content)
             return {
                 "status": status_info,
@@ -133,13 +135,13 @@ def _serialize_request(request):
         method = request.method
         if "X-HTTP-Method" in request.headers:
             method = request.headers["X-HTTP-Method"]
-        lines = ["{method} {url} HTTP/1.1".format(method=method, url=request.url),
-                 *[':'.join(h) for h in request.headers.items()]]
+        lines = ["{method} {url} HTTP/1.1".format(method=method, url=request.url)] + \
+                [':'.join(h) for h in request.headers.items()]
         if request.data:
             lines.append(eol)
             lines.append(json.dumps(request.data))
-        buffer = eol + eol.join(lines) + eol
-        payload = buffer.encode('utf-8').lstrip()
+        raw_content = eol + eol.join(lines) + eol
+        payload = raw_content.encode('utf-8').lstrip()
 
         message = Message()
         message.add_header("Content-Type", "application/http")

office365/runtime/odata/odata_path_parser.py

@@ -1,6 +1,7 @@
 import json
 
 from office365.runtime.client_value import ClientValue
+from office365.runtime.compat import is_string_type
 
 
 class ODataPathParser(object):
@@ -35,7 +36,7 @@ def from_method(method_name, method_parameters=None):
 
     @staticmethod
     def encode_method_value(value):
-        if type(value) is str:
+        if is_string_type(value):
             value = value.replace("'", "''")
 
             # Same replacements as SQL Server

office365/runtime/odata/odata_v3_reader.py

@@ -5,7 +5,7 @@ class ODataV3Reader(ODataBaseReader):
     """OData v3 reader"""
 
     def __init__(self, options):
-        super().__init__(options)
+        super(ODataV3Reader,self).__init__(options)
         self._options['namespaces'] = {
             'xmlns': 'http://schemas.microsoft.com/ado/2009/11/edm',
             'edmx': 'http://schemas.microsoft.com/ado/2007/06/edmx',

office365/runtime/odata/odata_v4_batch_request.py

@@ -8,7 +8,7 @@ class ODataV4BatchRequest(ClientRequest):
     """ JSON batch request """
 
     def __init__(self, context):
-        super().__init__(context)
+        super(ODataV4BatchRequest, self).__init__(context)
 
     def build_request(self, query):
         """

office365/runtime/odata/odata_v4_reader.py

@@ -6,7 +6,7 @@ class ODataV4Reader(ODataBaseReader):
     _options = None
 
     def __init__(self, options):
-        super().__init__(options)
+        super(ODataV4Reader, self).__init__(options)
         self._options['namespaces'] = {
             'xmlns': 'http://docs.oasis-open.org/odata/ns/edm',
             'edmx': 'http://docs.oasis-open.org/odata/ns/edmx'

office365/runtime/queries/batch_query.py

@@ -25,7 +25,7 @@ def __init__(self, context, queries=None):
         :type context: office365.runtime.client_runtime_context.ClientRuntimeContext
         :type queries: list[]
         """
-        super().__init__(context)
+        super(BatchQuery, self).__init__(context)
         self._current_boundary = create_boundary("batch_")
         if queries is None:
             queries = []