Skip to content

Commit d1650c8

Browse files
committed
#766 fix, SharePoint examples updates, typings enhancements
1 parent 4489512 commit d1650c8

File tree

38 files changed

+167
-162
lines changed

38 files changed

+167
-162
lines changed

examples/onedrive/files/search.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@
1010
client = GraphClient(acquire_token_by_username_password)
1111
result = client.search.query_drive_items("Guide.docx").execute_query()
1212
for item in result.value:
13-
print("Search terms: {0}".format(item.searchTerms))
13+
for hit_container in item.hitsContainers:
14+
for hit in hit_container.hits:
15+
print(hit.resource)

examples/onedrive/sites/__init__.py

Whitespace-only changes.

examples/planner/__init__.py

Whitespace-only changes.

examples/sharepoint/files/copy_file.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
"Shared Documents/Financial Sample.xlsx"
1111
)
1212
folder_to = ctx.web.get_folder_by_server_relative_url("Shared Documents/archive")
13+
# folder_to = "Shared Documents/archive/2002/02"
1314
file_to = file_from.copyto(folder_to, True).execute_query()
14-
print("File has been copied into '{0}'".format(file_to))
15+
print("{0} copied into '{1}'".format(file_from, file_to))

examples/sharepoint/files/copy_using_path.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
)
1212

1313
folder_to = ctx.web.get_folder_by_server_relative_path("Shared Documents/archive")
14+
# folder_to = "Shared Documents/archive/2002/02"
1415
file_to = file_from.copyto_using_path(folder_to, True).execute_query()
15-
print("File has been copied into '{0}'".format(file_to.server_relative_path))
16+
print("{0} copied into {1}".format(file_from, file_to))

examples/sharepoint/files/move_file.py

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,18 @@
33
"""
44
from office365.sharepoint.client_context import ClientContext
55
from office365.sharepoint.files.move_operations import MoveOperations
6-
from tests import create_unique_name, test_team_site_url, test_user_credentials
6+
from tests import test_team_site_url, test_user_credentials
77

88
ctx = ClientContext(test_team_site_url).with_credentials(test_user_credentials)
99

10-
print("Creating temporary folders and uploading a file...")
11-
path = "../../data/report #123.csv"
12-
folder_from = ctx.web.default_document_library().root_folder.add(
13-
create_unique_name("from")
14-
)
15-
folder_to = ctx.web.default_document_library().root_folder.add(create_unique_name("to"))
16-
file = folder_from.files.upload(path).execute_query()
1710

18-
# copies the file with a new name into folder
19-
print("Moving file to parent folder...")
20-
file_to = file.move_to_using_path(folder_to, MoveOperations.overwrite).execute_query()
21-
print(
22-
"File has been copied from '{0}' into '{1}'".format(
23-
file.server_relative_path, folder_to.serverRelativeUrl
24-
)
11+
file_from = ctx.web.get_file_by_server_relative_path(
12+
"Shared Documents/Financial Sample.xlsx"
2513
)
14+
# folder_to = ctx.web.get_folder_by_server_relative_url("Shared Documents")
15+
folder_to = "Shared Documents"
2616

27-
print("Cleaning up...")
28-
folder_from.delete_object().execute_query()
29-
folder_to.delete_object().execute_query()
17+
file_to = file_from.move_to_using_path(
18+
folder_to, MoveOperations.overwrite
19+
).execute_query()
20+
print("'{0}' moved into '{1}'".format(file_from, file_to))

examples/sharepoint/files/rename_page.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from office365.sharepoint.client_context import ClientContext
55
from tests import test_team_site_url, test_user_credentials
66

7-
from_url = "Home_Archive.aspx"
8-
to_url = "Home.aspx"
7+
file_url = "Site Pages/Home.aspx"
8+
new_name = "NewHome.aspx"
99
ctx = ClientContext(test_team_site_url).with_credentials(test_user_credentials)
10-
file = ctx.web.lists.get_by_title("Site Pages").root_folder.files.get_by_url(from_url)
11-
file.rename(to_url).execute_query()
10+
file = ctx.web.get_file_by_server_relative_path(file_url)
11+
file.rename(new_name).execute_query()

examples/sharepoint/folders/create.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@
1414
.execute_query()
1515
)
1616
print("Folder : {0} has been created".format(folder.serverRelativeUrl))
17-
folder.delete_object().execute_query()

examples/sharepoint/folders/create_doc_set.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
from tests import test_client_credentials, test_team_site_url
44

55
client = ClientContext(test_team_site_url).with_credentials(test_client_credentials)
6-
target_folder = client.web.default_document_library().root_folder.folders.get_by_url(
7-
"2017"
8-
)
9-
10-
doc_set = DocumentSet.create(client, target_folder, "07").execute_query()
6+
lib = client.web.default_document_library()
7+
doc_set = DocumentSet.create(client, lib.root_folder, "07").execute_query()
118
print("DocSet created: {0}".format(doc_set.name))

examples/sharepoint/folders/folder_exists.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from tests import test_client_credentials, test_team_site_url
66

77
ctx = ClientContext(test_team_site_url).with_credentials(test_client_credentials)
8-
folder_path = "SitePages"
8+
folder_path = "Shared Documents"
99
folder = (
1010
ctx.web.get_folder_by_server_relative_url(folder_path)
1111
.select(["Exists"])

0 commit comments

Comments
 (0)