diff --git a/src/display.py b/src/display.py index 8fa664de..14c7c656 100644 --- a/src/display.py +++ b/src/display.py @@ -22,14 +22,15 @@ def print_json(object_value, spacing=''): return if spacing: sys.stdout.write('\n') - for i in range(0, len(object_value)): - if isinstance(object_value[i], (str, int, bool)): + for i, a_value in enumerate(object_value): + if isinstance(a_value, (str, int, bool)): sys.stdout.write(f' {spacing}{i+1}) {a_value}\n') else: sys.stdout.write(f' {spacing}{i+1}) ') - print_json(object_value[i], f' {spacing}') + print_json(a_value, f' {spacing}') elif isinstance(object_value, dict): - [object_value.pop(key, None) for key in ['kind', 'etag', 'etags']] + for key in ['kind', 'etag', 'etags']: + object_value.pop(key, None) for another_object, another_value in object_value.items(): sys.stdout.write(f' {spacing}{another_object}: ') print_json(another_value, f' {spacing}') diff --git a/src/gam.py b/src/gam.py index 683c712d..d11aefdf 100755 --- a/src/gam.py +++ b/src/gam.py @@ -1203,8 +1203,8 @@ def doCheckServiceAccount(users): # Tack on email scope for more accurate checking check_scopes.append(USERINFO_EMAIL_SCOPE) long_url = (f'https://admin.google.com/{user_domain}/ManageOauthClients' - f'?clientScopeToAdd={",".join(check_scopes)}' - f'&clientNameToAdd={service_account}') + f'?clientScopeToAdd={",".join(check_scopes)}' + f'&clientNameToAdd={service_account}') short_url = shorten_url(long_url) scopes_failed = f'''Some scopes failed! To authorize them, please go to: @@ -7366,14 +7366,14 @@ def shorten_url(long_url): 'User-Agent': GAM_INFO} try: resp, content = simplehttp.request(url_shortnr, 'POST', - f'{{"long_url": "{long_url}"}}', headers=headers) - except Exception as e: + f'{{"long_url": "{long_url}"}}', headers=headers) + except Exception: return long_url if resp.status != 200: return long_url try: return json.loads(content).get('short_url', long_url) - except Exception as e: + except Exception: print(content) return long_url