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

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

Browse Source
This commit is contained in:
Ross Scroggs
2023-08-18 10:43:16 -07:00
parent b79c48718e 8354c63a62
commit 7573013da4
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -568,7 +568,7 @@ jobs:
- name: Basic Tests all jobs - name: Basic Tests all jobs
id: basictests id: basictests
run: | run: |
$PYTHON -m unittest discover --start-directory ./ --pattern "*_test.py" --buffer $PYTHON -m unittest discover --start-directory ./ --pattern "*_test.py" --buffer || if [ $? != 5 ]; then exit $?; fi # exit 5 is no tests
$gam version extended $gam version extended
export GAMVERSION=$($gam version simple) export GAMVERSION=$($gam version simple)
echo "GAM Version ${GAMVERSION}" echo "GAM Version ${GAMVERSION}"

1
src/gam/__init__.py
View File

@@ -12222,6 +12222,7 @@ def doCreateGCPServiceAccount():
systemErrorExit(API_ACCESS_DENIED_RC, str(e)) systemErrorExit(API_ACCESS_DENIED_RC, str(e))
sa_info['client_id'] = token_info['issued_to'] sa_info['client_id'] = token_info['issued_to']
sa_output = json.dumps(sa_info, ensure_ascii=False, sort_keys=True, indent=2) sa_output = json.dumps(sa_info, ensure_ascii=False, sort_keys=True, indent=2)
print(f'Writing SignJWT service account data:\n\n{sa_output}')
writeFile(GC.Values[GC.OAUTH2SERVICE_JSON], sa_output, continueOnError=False) writeFile(GC.Values[GC.OAUTH2SERVICE_JSON], sa_output, continueOnError=False)
# Audit command utilities # Audit command utilities

6
src/gam/gdata/service.py
View File

@@ -1087,7 +1087,7 @@ class GDataService(atom.service.AtomService):
location = (server_response.getheader('Location') location = (server_response.getheader('Location')
or server_response.getheader('location')) or server_response.getheader('location'))
if location is not None: if location is not None:
m = re.compile('[?&]gsessionid=(\w*)').search(location) m = re.compile(r'[?&]gsessionid=(\w*)').search(location)
if m is not None: if m is not None:
self.__gsessionid = m.group(1) self.__gsessionid = m.group(1)
return GDataService.Get(self, location, extra_headers, redirects_remaining - 1, return GDataService.Get(self, location, extra_headers, redirects_remaining - 1,
@@ -1335,7 +1335,7 @@ class GDataService(atom.service.AtomService):
location = (server_response.getheader('Location') location = (server_response.getheader('Location')
or server_response.getheader('location')) or server_response.getheader('location'))
if location is not None: if location is not None:
m = re.compile('[?&]gsessionid=(\w*)').search(location) m = re.compile(r'[?&]gsessionid=(\w*)').search(location)
if m is not None: if m is not None:
self.__gsessionid = m.group(1) self.__gsessionid = m.group(1)
return GDataService.PostOrPut(self, verb, data, location, return GDataService.PostOrPut(self, verb, data, location,
@@ -1433,7 +1433,7 @@ class GDataService(atom.service.AtomService):
location = (server_response.getheader('Location') location = (server_response.getheader('Location')
or server_response.getheader('location')) or server_response.getheader('location'))
if location is not None: if location is not None:
m = re.compile('[?&]gsessionid=(\w*)').search(location) m = re.compile(r'[?&]gsessionid=(\w*)').search(location)
if m is not None: if m is not None:
self.__gsessionid = m.group(1) self.__gsessionid = m.group(1)
return GDataService.Delete(self, location, extra_headers, return GDataService.Delete(self, location, extra_headers,