Skip to content

Commit d5c1c89

Browse files
committed
2.3.11 release
1 parent d9051f8 commit d5c1c89

11 files changed

+25
-31
lines changed

office365/onenote/internal/multipart_page_query.py

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
from base64 import encodebytes
2-
from email import encoders
31
from email.message import Message
4-
from email.mime.text import MIMEText
5-
62
from office365.runtime.compat import get_mime_type, message_as_bytes_or_string
73
from office365.runtime.http.http_method import HttpMethod
84
from office365.runtime.queries.batch_query import create_boundary

office365/runtime/client_value.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ class ClientValue(object):
77
containing entity or as a temporary value
88
"""
99

10-
def __init__(self):
11-
super(ClientValue, self).__init__()
12-
1310
def set_property(self, k, v, persist_changes=True):
1411
prop_type = getattr(self, k, None)
1512
if isinstance(prop_type, ClientValue) and v is not None:
@@ -20,6 +17,7 @@ def set_property(self, k, v, persist_changes=True):
2017
setattr(self, k, prop_type)
2118
else:
2219
setattr(self, k, v)
20+
return self
2321

2422
def get_property(self, k):
2523
return getattr(self, k)

office365/runtime/client_value_collection.py

+9-18
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
from office365.runtime.client_value import ClientValue
2+
from office365.runtime.odata.odata_type import ODataType
23
from office365.runtime.odata.v3.json_light_format import JsonLightFormat
34

45

@@ -37,16 +38,14 @@ def to_json(self, json_format=None):
3738
"""
3839
:type json_format: office365.runtime.odata.odata_json_format.ODataJsonFormat or None
3940
"""
40-
json_items = [item for item in self._data]
41-
for i, v in enumerate(json_items):
41+
json = [item for item in self._data]
42+
for i, v in enumerate(json):
4243
if isinstance(v, ClientValue):
43-
json_items[i] = v.to_json(json_format)
44+
json[i] = v.to_json(json_format)
4445
if isinstance(json_format, JsonLightFormat) and json_format.include_control_information():
45-
json = {json_format.collection_tag_name: json_items,
46+
json = {json_format.collection_tag_name: json,
4647
json_format.metadata_type_tag_name: {'type': self.entity_type_name}}
47-
48-
return json
49-
return json_items
48+
return json
5049

5150
def set_property(self, index, value, persist_changes=False):
5251
child_value = self._item_type()
@@ -56,23 +55,15 @@ def set_property(self, index, value, persist_changes=False):
5655
else:
5756
child_value = value
5857
self.add(child_value)
58+
return self
5959

6060
@property
6161
def entity_type_name(self):
62-
"""
63-
Gets server type name
64-
"""
65-
primitive_types = {
66-
bool: "Edm.Boolean",
67-
int: "Edm.Int32",
68-
str: "Edm.String",
69-
}
70-
7162
item_type_name = None
7263

73-
is_primitive = primitive_types.get(self._item_type, None) is not None
64+
is_primitive = ODataType.primitive_types.get(self._item_type, None) is not None
7465
if is_primitive:
75-
item_type_name = primitive_types[self._item_type]
66+
item_type_name = ODataType.primitive_types[self._item_type]
7667
elif issubclass(self._item_type, ClientValue):
7768
item_type_name = self._item_type.entity_type_name.fget(self)
7869

office365/runtime/odata/odata_type.py

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
class ODataType(object):
22

3+
primitive_types = {
4+
bool: "Edm.Boolean",
5+
int: "Edm.Int32",
6+
str: "Edm.String",
7+
}
8+
"""Primitive server types"""
9+
310
def __init__(self):
411
self.name = None
512
self.namespace = None

office365/sharepoint/sharing/document_sharing_manager.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from office365.runtime.queries.service_operation_query import ServiceOperationQuery
55
from office365.sharepoint.base_entity import BaseEntity
66
from office365.sharepoint.permissions.role_definition import RoleDefinition
7-
from office365.sharepoint.sharing.userSharingResult import UserSharingResult
7+
from office365.sharepoint.sharing.user_sharing_result import UserSharingResult
88

99

1010
class SharedWithMeViewItemRemovalResult(ClientValue):

office365/sharepoint/sharing/sharing_result.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from office365.sharepoint.base_entity import BaseEntity
44
from office365.sharepoint.principal.group_collection import GroupCollection
55
from office365.sharepoint.sharing.invitation_creation_result import SPInvitationCreationResult
6-
from office365.sharepoint.sharing.userSharingResult import UserSharingResult
6+
from office365.sharepoint.sharing.user_sharing_result import UserSharingResult
77

88

99
class SharingResult(BaseEntity):

office365/sharepoint/sharing/sharing_utility.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from office365.runtime.queries.service_operation_query import ServiceOperationQuery
33
from office365.runtime.paths.resource_path import ResourcePath
44
from office365.sharepoint.base_entity import BaseEntity
5-
from office365.sharepoint.sharing.userDirectoryInfo import UserDirectoryInfo
5+
from office365.sharepoint.sharing.user_directory_info import UserDirectoryInfo
66

77

88
class SharingUtility(BaseEntity):

office365/sharepoint/sharing/userSharingResult.py renamed to office365/sharepoint/sharing/user_sharing_result.py

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44

55
class UserSharingResult(ClientValue):
6+
"""Specifies a sharing result for an individual user that method UpdateDocumentSharingInfo
7+
(section 3.2.5.187.2.1.1) returns."""
68

79
def __init__(self):
810
super(UserSharingResult, self).__init__()

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
setup(
1212
name="Office365-REST-Python-Client",
13-
version="2.3.10",
13+
version="2.3.11",
1414
author="Vadim Gremyachev",
1515
author_email="vvgrem@gmail.com",
1616
maintainer="Konrad Gądek, Domenico Di Nicola",

tests/sharepoint/test_tenant.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ def test_10_get_site_by_url(self):
8484

8585
def test_11_update_site(self):
8686
site_props_to_update = self.__class__.target_site_props
87-
site_props_to_update.set_property('SharingCapability', SharingCapabilities.Disabled)
87+
site_props_to_update.set_property('SharingCapability', SharingCapabilities.ExternalUserAndGuestSharing)
8888
site_props_to_update.update().execute_query()
8989

9090
updated_site_props = self.tenant.get_site_properties_by_url(test_site_url, True).execute_query()
91-
self.assertTrue(updated_site_props.sharing_capability == SharingCapabilities.Disabled)
91+
self.assertTrue(updated_site_props.sharing_capability == SharingCapabilities.ExternalUserAndGuestSharing)
9292

9393
# self.assertTrue(site_props_to_update.properties['Status'], 'Active')
9494

0 commit comments

Comments
 (0)