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

Appease the pylint gods

Browse Source
This commit is contained in:
Ross Scroggs
2023-08-02 14:32:08 -07:00
parent a526d519bd
commit e648a01d95
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/gam/__init__.py
View File

@@ -4492,18 +4492,19 @@ def refreshCredentialsWithReauth(credentials):
subprocess.run(['gcloud', subprocess.run(['gcloud',
'auth', 'auth',
'print-identity-token', 'print-identity-token',
'--no-user-output-enabled']) '--no-user-output-enabled'],
check=False)
# now determine gcloud's config path and token file # now determine gcloud's config path and token file
gcloud_path_result = subprocess.run(['gcloud', gcloud_path_result = subprocess.run(['gcloud',
'info', 'info',
'--format=value(config.paths.global_config_dir)'], '--format=value(config.paths.global_config_dir)'],
capture_output=True) capture_output=True, ckeck=False)
except KeyboardInterrupt: except KeyboardInterrupt as e:
# avoids loss of terminal echo on *nix # avoids loss of terminal echo on *nix
if 'termios' in sys.modules: if 'termios' in sys.modules:
termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old_settings) termios.tcsetattr(sys.stdin, termios.TCSADRAIN, old_settings)
printBlankLine() printBlankLine()
raise KeyboardInterrupt raise KeyboardInterrupt from e
token_path = gcloud_path_result.stdout.decode().strip() token_path = gcloud_path_result.stdout.decode().strip()
token_file = f'{token_path}/access_tokens.db' token_file = f'{token_path}/access_tokens.db'
admin_email = _getAdminEmail() admin_email = _getAdminEmail()
@@ -4512,10 +4513,10 @@ def refreshCredentialsWithReauth(credentials):
f'SELECT rapt_token FROM access_tokens WHERE account_id = "{admin_email}"') f'SELECT rapt_token FROM access_tokens WHERE account_id = "{admin_email}"')
except TypeError: except TypeError:
systemErrorExit(SYSTEM_ERROR_RC, systemErrorExit(SYSTEM_ERROR_RC,
f'failed to run gcloud as {admin_email}. Please make sure it\'s setup') f'Failed to run gcloud as {admin_email}. Please make sure it\'s setup')
if not credentials._rapt_token: if not credentials._rapt_token:
systemErrorExit(SYSTEM_ERROR_RC, systemErrorExit(SYSTEM_ERROR_RC,
f'failed to retrieve reauth token from gcloud. You may need to wait until gcloud is also prompted for reauth.') f'Failed to retrieve reauth token from gcloud. You may need to wait until gcloud is also prompted for reauth.')
def getClientCredentials(forceRefresh=False, forceWrite=False, filename=None, api=None, noDASA=False, refreshOnly=False, noScopes=False): def getClientCredentials(forceRefresh=False, forceWrite=False, filename=None, api=None, noDASA=False, refreshOnly=False, noScopes=False):
"""Gets OAuth2 credentials which are guaranteed to be fresh and valid. """Gets OAuth2 credentials which are guaranteed to be fresh and valid.