From 75d7f707814b831df812c5fe6f8f275f6e28c676 Mon Sep 17 00:00:00 2001 From: Alejandro Casanovas Date: Mon, 15 Apr 2019 10:52:17 +0200 Subject: [PATCH] Fixed #228 This was caused because the parenthesis around the expresion using an inline if was misplaced --- O365/address_book.py | 12 +++++------ O365/calendar.py | 19 ++++++++--------- O365/drive.py | 36 +++++++++++++------------------ O365/mailbox.py | 6 +++--- O365/message.py | 6 +++--- O365/planner.py | 6 ++---- O365/sharepoint.py | 50 ++++++++++++++++++++------------------------ 7 files changed, 60 insertions(+), 75 deletions(-) diff --git a/O365/address_book.py b/O365/address_book.py index ba9ceab58fa6f..63c3b60123615 100644 --- a/O365/address_book.py +++ b/O365/address_book.py @@ -47,9 +47,9 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.con = parent.con if parent else con # Choose the main_resource passed in kwargs over parent main_resource - main_resource = kwargs.pop('main_resource', - None) or getattr(parent, 'main_resource', - None) if parent else None + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) + super().__init__( protocol=parent.protocol if parent else kwargs.get('protocol'), main_resource=main_resource) @@ -596,9 +596,9 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.con = parent.con if parent else con # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) + super().__init__( protocol=parent.protocol if parent else kwargs.get('protocol'), main_resource=main_resource) diff --git a/O365/calendar.py b/O365/calendar.py index e68d543a4978b..6393905847811 100644 --- a/O365/calendar.py +++ b/O365/calendar.py @@ -805,9 +805,9 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.con = parent.con if parent else con # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) + super().__init__( protocol=parent.protocol if parent else kwargs.get('protocol'), main_resource=main_resource) @@ -1479,10 +1479,9 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.con = parent.con if parent else con # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, - 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) + super().__init__( protocol=parent.protocol if parent else kwargs.get('protocol'), main_resource=main_resource) @@ -1731,9 +1730,9 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.con = parent.con if parent else con # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) + super().__init__( protocol=parent.protocol if parent else kwargs.get('protocol'), main_resource=main_resource) diff --git a/O365/drive.py b/O365/drive.py index fdfeba39804b9..427b2acea59ac 100644 --- a/O365/drive.py +++ b/O365/drive.py @@ -132,9 +132,9 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.parent = parent # parent will be always a DriveItem # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) + super().__init__( protocol=parent.protocol if parent else kwargs.get('protocol'), main_resource=main_resource) @@ -225,10 +225,8 @@ def __init__(self, *, parent=None, con=None, **kwargs): protocol = parent.protocol if parent else kwargs.get('protocol') # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, - 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) resource_prefix = '/items/{item_id}'.format( item_id=self._parent.object_id) @@ -311,10 +309,9 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.con = parent.con if parent else con self._parent = parent if isinstance(parent, DriveItem) else None # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, - 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) + protocol = parent.protocol if parent else kwargs.get('protocol') super().__init__(protocol=protocol, main_resource=main_resource) @@ -444,10 +441,8 @@ def __init__(self, *, parent=None, con=None, **kwargs): 'drive', None)) # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, - 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) protocol = parent.protocol if parent else kwargs.get('protocol') if parent and not isinstance(parent, DriveItem): @@ -1270,10 +1265,8 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.parent = parent if isinstance(parent, Drive) else None # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, - 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) super().__init__( protocol=parent.protocol if parent else kwargs.get('protocol'), main_resource=main_resource) @@ -1644,9 +1637,8 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.con = parent.con if parent else con # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) super().__init__( protocol=parent.protocol if parent else kwargs.get('protocol'), main_resource=main_resource) diff --git a/O365/mailbox.py b/O365/mailbox.py index c2620fefbe108..ae123e54a405d 100644 --- a/O365/mailbox.py +++ b/O365/mailbox.py @@ -46,9 +46,9 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.root = kwargs.pop('root', False) # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) + super().__init__( protocol=parent.protocol if parent else kwargs.get('protocol'), main_resource=main_resource) diff --git a/O365/message.py b/O365/message.py index 20d2321dcbabc..5a478306876ef 100644 --- a/O365/message.py +++ b/O365/message.py @@ -193,9 +193,9 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.con = parent.con if parent else con # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) + super().__init__( protocol=parent.protocol if parent else kwargs.get('protocol'), main_resource=main_resource, diff --git a/O365/planner.py b/O365/planner.py index 73bb4aa6c08b9..b142e4dda2815 100644 --- a/O365/planner.py +++ b/O365/planner.py @@ -31,10 +31,8 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.object_id = cloud_data.get('id') # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, - 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) main_resource = '{}{}'.format(main_resource, '') diff --git a/O365/sharepoint.py b/O365/sharepoint.py index 160801ce3a5bb..89aef6640bfeb 100644 --- a/O365/sharepoint.py +++ b/O365/sharepoint.py @@ -20,7 +20,8 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.con = parent.con if parent else con # Choose the main_resource passed in kwargs over the parent main_resource - main_resource = kwargs.pop('main_resource', None) or getattr(parent, 'main_resource', None) if parent else None + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) super().__init__(protocol=parent.protocol if parent else kwargs.get('protocol'), main_resource=main_resource) @@ -84,9 +85,8 @@ def __init__(self, *, parent=None, con=None, **kwargs): self._parent = parent # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) super().__init__( protocol=parent.protocol if parent else kwargs.get('protocol'), @@ -122,15 +122,15 @@ def _clear_tracker(self): self._track_changes = TrackerSet(casing=self._cc) def _valid_field(self, field): - #Verify the used field names are valid internal field names + # Verify the used field names are valid internal field names valid_field_names = self.fields if self.fields \ - else self._parent.column_name_cw.values() \ - if self._parent \ - else None + else self._parent.column_name_cw.values() \ + if self._parent \ + else None if valid_field_names: return field in valid_field_names - #If no parent is given, and no internal fields are defined assume correct, API will check + # If no parent is given, and no internal fields are defined assume correct, API will check return True def update_fields(self, updates): @@ -146,7 +146,7 @@ def update_fields(self, updates): else: raise ValueError('"{}" is not a valid internal field name'.format(field)) - #Update existing instance of fields, or create a fields instance if needed + # Update existing instance of fields, or create a fields instance if needed if self.fields: self.fields.update(updates) else: @@ -156,11 +156,11 @@ def save_updates(self): """Save the updated fields to the cloud""" if not self._track_changes: - return True # there's nothing to update + return True # there's nothing to update url = self.build_url(self._endpoints.get('update_list_item').format(item_id=self.object_id)) update = {field: value for field, value in self.fields.items() - if self._cc(field) in self._track_changes} + if self._cc(field) in self._track_changes} response = self.con.patch(url, update) if not response: @@ -198,10 +198,8 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.object_id = cloud_data.get('id') # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, - 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) # prefix with the current known list resource_prefix = '/lists/{list_id}'.format(list_id=self.object_id) @@ -241,11 +239,11 @@ def __init__(self, *, parent=None, con=None, **kwargs): self._cc('contentTypesEnabled'), False) self.hidden = lst_info.get(self._cc('hidden'), False) self.template = lst_info.get(self._cc('template'), False) - - #Crosswalk between display name of user defined columns to internal name - self.column_name_cw = {col.display_name: col.internal_name for + + # Crosswalk between display name of user defined columns to internal name + self.column_name_cw = {col.display_name: col.internal_name for col in self.get_list_columns() if not col.read_only} - + def get_items(self): """ Returns a collection of Sharepoint Items @@ -321,7 +319,7 @@ def delete_list_item(self, item_id): response = self.con.delete(url) - return bool(response) + return bool(response) class Site(ApiComponent): @@ -354,15 +352,13 @@ def __init__(self, *, parent=None, con=None, **kwargs): self.object_id = cloud_data.get('id') # Choose the main_resource passed in kwargs over parent main_resource - main_resource = (kwargs.pop('main_resource', None) or - getattr(parent, - 'main_resource', - None) if parent else None) + main_resource = kwargs.pop('main_resource', None) or ( + getattr(parent, 'main_resource', None) if parent else None) # prefix with the current known site resource_prefix = 'sites/{site_id}'.format(site_id=self.object_id) - main_resource = (resource_prefix if isinstance(parent,Site) - else '{}{}'.format(main_resource, resource_prefix)) + main_resource = (resource_prefix if isinstance(parent, Site) + else '{}{}'.format(main_resource, resource_prefix)) super().__init__( protocol=parent.protocol if parent else kwargs.get('protocol'),