deepblue/GoogleDriveManagement
1
0
Fork 0
mirror of https://github.com/GAM-team/GAM.git synced 2026-07-03 20:31:35 +00:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/GAM-team/GAM

Browse Source
This commit is contained in:
Jay Lee
2022-09-15 14:46:53 +00:00
parent 8be4445f0d 550cf47db4
commit 97bd1f71c3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gam/gapi/__init__.py
View File

@@ -339,10 +339,10 @@ def get_all_pages(service,
else: else:
kwargs.update(page_key) kwargs.update(page_key)
if GC_Values[GC_LOW_MEMORY]: if GC_Values[GC_LOW_MEMORY]:
kwargs = {} td_args = {'prefix': 'GAM-'}
if sys.version_info.minor >= 10: if sys.version_info.minor >= 10:
kwargs['ignore_cleanup_errors'] = True td_args['ignore_cleanup_errors'] = True
tempdir = TemporaryDirectory(prefix='GAM-', **kwargs) tempdir = TemporaryDirectory(**td_args)
tempfile = os.path.join(tempdir.name, 'gapi_pages') tempfile = os.path.join(tempdir.name, 'gapi_pages')
all_items = shelve.open(tempfile) all_items = shelve.open(tempfile)
# attach tempdir to all_items so we # attach tempdir to all_items so we

1
src/gam/gapi/reports.py
View File

@@ -426,6 +426,7 @@ def showReport():
titles = ['name', 'value', 'client_id'] titles = ['name', 'value', 'client_id']
csvRows = [] csvRows = []
auth_apps = list() auth_apps = list()
usage = list(usage)
for item in usage[0]['parameters']: for item in usage[0]['parameters']:
if 'name' not in item: if 'name' not in item:
continue continue