diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index ebbdd353..28ef2ff3 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,3 +1,9 @@ +7.07.12 + +Fixed bug in `gam print|show oushareddrives` that caused a trap. + +Improved getting Shared Drive names from IDs when accessing Shared Drives in external workspaces. + 7.07.11 Updated `gam calendars update events` and `gam update events ` diff --git a/src/gam/__init__.py b/src/gam/__init__.py index c8ea34bd..8948c5ca 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -3,7 +3,7 @@ # # GAM7 # -# Copyright 2024, All Rights Reserved. +# Copyright 2025, All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki """ __author__ = 'GAM Team ' -__version__ = '7.07.11' +__version__ = '7.07.12' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' #pylint: disable=wrong-import-position @@ -42021,22 +42021,21 @@ def printShowUserVaultHolds(entityList): else: printKeyValueList(['Total Holds', totalHolds]) -def _cleanVaultQuery(query, cd): +def _cleanVaultQuery(query, cd, drive): if 'query' in query: - if cd is not None: - if 'orgUnitInfo' in query['query']: - query['query']['orgUnitInfo']['orgUnitPath'] = convertOrgUnitIDtoPath(cd, query['query']['orgUnitInfo']['orgUnitId']) - if 'sharedDriveInfo' in query['query']: - query['query']['sharedDriveInfo']['sharedDriveNames'] = [] - for sharedDriveId in query['query']['sharedDriveInfo']['sharedDriveIds']: - query['query']['sharedDriveInfo']['sharedDriveNames'].append(_getSharedDriveNameFromId(sharedDriveId)) + if cd is not None and 'orgUnitInfo' in query['query']: + query['query']['orgUnitInfo']['orgUnitPath'] = convertOrgUnitIDtoPath(cd, query['query']['orgUnitInfo']['orgUnitId']) + if drive is not None and 'sharedDriveInfo' in query['query']: + query['query']['sharedDriveInfo']['sharedDriveNames'] = [] + for sharedDriveId in query['query']['sharedDriveInfo']['sharedDriveIds']: + query['query']['sharedDriveInfo']['sharedDriveNames'].append(_getSharedDriveNameFromId(drive, sharedDriveId, False)) query['query'].pop('searchMethod', None) query['query'].pop('teamDriveInfo', None) VAULT_QUERY_TIME_OBJECTS = {'createTime', 'endTime', 'startTime', 'versionDate'} -def _showVaultQuery(matterNameId, query, cd, FJQC, k=0, kcount=0): - _cleanVaultQuery(query, cd) +def _showVaultQuery(matterNameId, query, cd, drive, FJQC, k=0, kcount=0): + _cleanVaultQuery(query, cd, drive) if FJQC is not None and FJQC.formatJSON: printLine(json.dumps(cleanJSON(query, timeObjects=VAULT_QUERY_TIME_OBJECTS), ensure_ascii=False, sort_keys=False)) return @@ -42068,7 +42067,7 @@ def doInfoVaultQuery(): queryId, queryName, queryNameId = convertQueryNameToID(v, getString(Cmd.OB_QUERY_ITEM), matterId, matterNameId) else: queryName = getString(Cmd.OB_QUERY_ITEM) - cd = None + cd = drive = None fieldsList = [] FJQC = FormatJSONQuoteChar() while Cmd.ArgumentsRemaining(): @@ -42078,8 +42077,8 @@ def doInfoVaultQuery(): queryId, queryName, queryNameId = convertQueryNameToID(v, queryName, matterId, matterNameId) elif myarg == 'shownames': cd = buildGAPIObject(API.DIRECTORY) - _, GM.Globals[GM.ADMIN_DRIVE] = buildGAPIServiceObject(API.DRIVE3, _getAdminEmail()) - if GM.Globals[GM.ADMIN_DRIVE] is None: + _, drive = buildGAPIServiceObject(API.DRIVE3, _getAdminEmail()) + if drive is None: return elif getFieldsList(myarg, VAULT_QUERY_FIELDS_CHOICE_MAP, fieldsList, initialField=['savedQueryId', 'displayName']): pass @@ -42090,7 +42089,7 @@ def doInfoVaultQuery(): query = callGAPI(v.matters().savedQueries(), 'get', throwReasons=[GAPI.NOT_FOUND, GAPI.BAD_REQUEST, GAPI.FORBIDDEN, GAPI.INVALID_ARGUMENT], matterId=matterId, savedQueryId=queryId, fields=fields) - _showVaultQuery(matterNameId, query, cd, FJQC) + _showVaultQuery(matterNameId, query, cd, drive, FJQC) except (GAPI.notFound, GAPI.badRequest, GAPI.forbidden, GAPI.invalidArgument) as e: entityActionFailedWarning([Ent.VAULT_MATTER, matterNameId, Ent.VAULT_QUERY, queryNameId], str(e)) @@ -42107,7 +42106,7 @@ def doPrintShowVaultQueries(): csvPF = CSVPrintFile(PRINT_VAULT_QUERIES_TITLES, 'sortall') if Act.csvFormat() else None FJQC = FormatJSONQuoteChar(csvPF) matters = [] - cd = None + cd = drive = None fieldsList = [] while Cmd.ArgumentsRemaining(): myarg = getArgument() @@ -42117,8 +42116,8 @@ def doPrintShowVaultQueries(): matters = shlexSplitList(getString(Cmd.OB_MATTER_ITEM_LIST)) elif myarg == 'shownames': cd = buildGAPIObject(API.DIRECTORY) - _, GM.Globals[GM.ADMIN_DRIVE] = buildGAPIServiceObject(API.DRIVE3, _getAdminEmail()) - if GM.Globals[GM.ADMIN_DRIVE] is None: + _, drive = buildGAPIServiceObject(API.DRIVE3, _getAdminEmail()) + if drive is None: return elif getFieldsList(myarg, VAULT_QUERY_FIELDS_CHOICE_MAP, fieldsList, initialField=['savedQueryId', 'displayName']): pass @@ -42180,11 +42179,11 @@ def doPrintShowVaultQueries(): k = 0 for query in queries: k += 1 - _showVaultQuery(matterNameId, query, cd, FJQC, k, kcount) + _showVaultQuery(matterNameId, query, cd, drive, FJQC, k, kcount) Ind.Decrement() else: for query in queries: - _cleanVaultQuery(query, cd) + _cleanVaultQuery(query, cd, drive) row = flattenJSON(query, flattened={'matterId': matterId, 'matterName': matterName}, timeObjects=VAULT_QUERY_TIME_OBJECTS) if not FJQC.formatJSON: csvPF.WriteRowTitles(row) @@ -52447,20 +52446,15 @@ def _convertSharedDriveNameToId(drive, user, i, count, fileIdEntity, useDomainAd ','.join([td['id'] for td in tdlist])), i, count) return False -def _getSharedDriveNameFromId(sharedDriveId): +def _getSharedDriveNameFromId(drive, sharedDriveId, useDomainAdminAccess=False): sharedDriveName = GM.Globals[GM.MAP_SHAREDDRIVE_ID_TO_NAME].get(sharedDriveId) if not sharedDriveName: - if not GM.Globals[GM.ADMIN_DRIVE]: - _, GM.Globals[GM.ADMIN_DRIVE] = buildGAPIServiceObject(API.DRIVE3, _getAdminEmail()) - if GM.Globals[GM.ADMIN_DRIVE]: - try: - sharedDriveName = callGAPI(GM.Globals[GM.ADMIN_DRIVE].drives(), 'get', - throwReasons=GAPI.DRIVE_USER_THROW_REASONS+[GAPI.NOT_FOUND], - useDomainAdminAccess=True, - driveId=sharedDriveId, fields='name')['name'] - except (GAPI.notFound, GAPI.serviceNotAvailable, GAPI.authError, GAPI.domainPolicy): - sharedDriveName = TEAM_DRIVE - else: + try: + sharedDriveName = callGAPI(drive.drives(), 'get', + throwReasons=GAPI.DRIVE_USER_THROW_REASONS+[GAPI.NOT_FOUND], + useDomainAdminAccess=useDomainAdminAccess, + driveId=sharedDriveId, fields='name')['name'] + except (GAPI.notFound, GAPI.serviceNotAvailable, GAPI.authError, GAPI.domainPolicy): sharedDriveName = TEAM_DRIVE GM.Globals[GM.MAP_SHAREDDRIVE_ID_TO_NAME][sharedDriveId] = sharedDriveName return sharedDriveName @@ -52473,7 +52467,7 @@ def _getDriveFileNameFromId(drive, fileId, combineTitleId=True, useDomainAdminAc if result: fileName = result['name'] if (result['mimeType'] == MIMETYPE_GA_FOLDER) and result.get('driveId') and (result['name'] == TEAM_DRIVE): - fileName = _getSharedDriveNameFromId(result['driveId']) + fileName = _getSharedDriveNameFromId(drive, result['driveId']) if combineTitleId: fileName += '('+fileId+')' return (fileName, _getEntityMimeType(result), result['mimeType']) @@ -53555,7 +53549,7 @@ def getFilePaths(drive, fileTree, initialResult, filePathInfo, addParentsToTree= fullpath=False, showDepth=False, folderPathOnly=False): def _getParentName(result): if (result['mimeType'] == MIMETYPE_GA_FOLDER) and result.get('driveId') and (result['name'] == TEAM_DRIVE): - parentName = _getSharedDriveNameFromId(result['driveId']) + parentName = _getSharedDriveNameFromId(drive, result['driveId']) if parentName != TEAM_DRIVE: return f'{SHARED_DRIVES}{filePathInfo["delimiter"]}{parentName}' return result['name'] @@ -54254,9 +54248,9 @@ def showFileInfo(users): driveId = result.get('driveId') if driveId: if result['mimeType'] == MIMETYPE_GA_FOLDER and result['name'] == TEAM_DRIVE: - result['name'] = _getSharedDriveNameFromId(driveId) + result['name'] = _getSharedDriveNameFromId(drive, driveId) if DFF.showSharedDriveNames: - result['driveName'] = _getSharedDriveNameFromId(driveId) + result['driveName'] = _getSharedDriveNameFromId(drive, driveId) if showNoParents: result.setdefault('parents', []) if getPermissionsForSharedDrives and driveId and 'permissions' not in result: @@ -54944,7 +54938,7 @@ def extendFileTreeParents(drive, fileTree, fields): result['parents'] = [ORPHANS] if result.get('ownedByMe', False) and 'sharedWithMeTime' not in result else [SHARED_WITHME] else: if result['name'] == TEAM_DRIVE: - result['name'] = _getSharedDriveNameFromId(result['driveId']) + result['name'] = _getSharedDriveNameFromId(drive, result['driveId']) result['parents'] = [SHARED_DRIVES] if 'sharedWithMeTime' not in result else [SHARED_WITHME] fileTree[fileId]['info'] = result fileTree[fileId]['info']['noDisplay'] = True @@ -55689,7 +55683,7 @@ def printFileList(users): if not pmselect and 'permissions' in fileInfo: fileInfo['permissions'] = DLP.GetFileMatchingPermission(fileInfo) if DFF.showSharedDriveNames and driveId: - fileInfo['driveName'] = _getSharedDriveNameFromId(driveId) + fileInfo['driveName'] = _getSharedDriveNameFromId(drive, driveId) if filepath: if not FJQC.formatJSON or not addPathsToJSON: addFilePathsToRow(drive, fileTree, fileInfo, filePathInfo, csvPF, row, @@ -56559,7 +56553,7 @@ def printShowFilePaths(users): driveId = result.get('driveId') if driveId: if result['mimeType'] == MIMETYPE_GA_FOLDER and result['name'] == TEAM_DRIVE: - result['name'] = _getSharedDriveNameFromId(driveId) + result['name'] = _getSharedDriveNameFromId(drive, driveId) if returnPathOnly: if fullpath: writeStdout(f'{SHARED_DRIVES}/{result["name"]}\n') @@ -56649,7 +56643,7 @@ def printFileParentTree(users): driveId = result.get('driveId') if driveId: if result['mimeType'] == MIMETYPE_GA_FOLDER and result['name'] == TEAM_DRIVE: - result['name'] = _getSharedDriveNameFromId(driveId) + result['name'] = _getSharedDriveNameFromId(drive, driveId) result['isRoot'] = True result['parents'] = [''] fileList.append(result) @@ -56886,7 +56880,7 @@ def printShowFileCounts(users): if not drive: continue sharedDriveId = fileIdEntity.get('shareddrive', {}).get('driveId', '') - sharedDriveName = _getSharedDriveNameFromId(sharedDriveId) if sharedDriveId else '' + sharedDriveName = _getSharedDriveNameFromId(drive, sharedDriveId) if sharedDriveId else '' mimeTypeInfo = {} userLastModification = _initLastModification() gettingEntity = _getGettingEntity(user, fileIdEntity) @@ -57031,7 +57025,7 @@ def printShowDrivelastModifications(users): if not drive: continue sharedDriveId = fileIdEntity.get('shareddrive', {}).get('driveId', '') - sharedDriveName = _getSharedDriveNameFromId(sharedDriveId) if sharedDriveId else '' + sharedDriveName = _getSharedDriveNameFromId(drive, sharedDriveId) if sharedDriveId else '' userLastModification = _initLastModification() gettingEntity = _getGettingEntity(user, fileIdEntity) printGettingAllEntityItemsForWhom(Ent.DRIVE_FILE_OR_FOLDER, gettingEntity, i, count) @@ -57214,7 +57208,7 @@ def printDiskUsage(users): includeOwner = False csvPF.RemoveTitles(['Owner', 'ownedByMe']) if topFolder['name'] == TEAM_DRIVE and not topFolder.get('parents'): - topFolder['name'] = _getSharedDriveNameFromId(driveId) + topFolder['name'] = _getSharedDriveNameFromId(drive, driveId) topFolder['path'] = f'{SHARED_DRIVES}{pathDelimiter}{topFolder["name"]}' else: topFolder['path'] = topFolder['name'] @@ -57654,7 +57648,7 @@ def printShowFileTree(users): fileId=fileId, fields=fields, supportsAllDrives=True) if (fileEntryInfo['mimeType'] == MIMETYPE_GA_FOLDER and fileEntryInfo.get('driveId') and fileEntryInfo['name'] == TEAM_DRIVE and not fileEntryInfo.get('parents', [])): - fileEntryInfo['name'] = f"{SHARED_DRIVES}/{_getSharedDriveNameFromId(fileId)}" + fileEntryInfo['name'] = f"{SHARED_DRIVES}/{_getSharedDriveNameFromId(drive, fileId)}" if stripCRsFromName: fileEntryInfo['name'] = _stripControlCharsFromName(fileEntryInfo['name']) if buildTree: @@ -59295,7 +59289,7 @@ def _getCopyMoveParentInfo(drive, user, i, count, j, jcount, newParentId, statis result['destParentType'] = DEST_PARENT_MYDRIVE_FOLDER else: if result['name'] == TEAM_DRIVE and not result.get('parents', []): - result['name'] = _getSharedDriveNameFromId(result['driveId']) + result['name'] = _getSharedDriveNameFromId(drive, result['driveId']) result['destParentType'] = DEST_PARENT_SHAREDDRIVE_ROOT else: result['destParentType'] = DEST_PARENT_SHAREDDRIVE_FOLDER @@ -59844,7 +59838,7 @@ def copyDriveFile(users): # Source at root of Shared Drive? sourceMimeType = source['mimeType'] if sourceMimeType == MIMETYPE_GA_FOLDER and source.get('driveId') and source['name'] == TEAM_DRIVE and not source.get('parents', []): - source['name'] = _getSharedDriveNameFromId(source['driveId']) + source['name'] = _getSharedDriveNameFromId(drive, source['driveId']) sourceName = source['name'] sourceNameId = f"{sourceName}({source['id']})" copyMoveOptions['sourceDriveId'] = source.get('driveId') @@ -60615,7 +60609,7 @@ def moveDriveFile(users): if sourceMimeType == MIMETYPE_GA_FOLDER and source['name'] in [MY_DRIVE, TEAM_DRIVE] and not source.get('parents', []): copyMoveOptions['sourceIsMyDriveSharedDrive'] = True if source.get('driveId'): - source['name'] = _getSharedDriveNameFromId(source['driveId']) + source['name'] = _getSharedDriveNameFromId(drive, source['driveId']) sourceName = source['name'] sourceNameId = f"{sourceName}({source['id']})" copyMoveOptions['sourceDriveId'] = source.get('driveId') @@ -63059,7 +63053,7 @@ def printEmptyDriveFolders(users): fileIdEntity['shareddrive'] = {'driveId': sharedDriveId, 'corpora': 'drive', 'includeItemsFromAllDrives': True, 'supportsAllDrives': True} csvPF.AddTitles(['driveId']) csvPF.MoveTitlesToEnd(['name']) - pathList = [f'{SHARED_DRIVES}/{_getSharedDriveNameFromId(sharedDriveId)}'] + pathList = [f'{SHARED_DRIVES}/{_getSharedDriveNameFromId(drive, sharedDriveId)}'] else: pathList = [fileEntryInfo['name']] mimeType = fileEntryInfo['mimeType'] @@ -63149,7 +63143,7 @@ def deleteEmptyDriveFolders(users): if 'driveId' in fileEntryInfo: sharedDriveId = fileEntryInfo['driveId'] fileIdEntity['shareddrive'] = {'driveId': sharedDriveId, 'corpora': 'drive', 'includeItemsFromAllDrives': True, 'supportsAllDrives': True} - pathList = [f'{SHARED_DRIVES}/{_getSharedDriveNameFromId(sharedDriveId)}'] + pathList = [f'{SHARED_DRIVES}/{_getSharedDriveNameFromId(drive, sharedDriveId)}'] else: pathList = [fileEntryInfo['name']] mimeType = fileEntryInfo['mimeType'] @@ -65586,7 +65580,7 @@ def doPrintShowSharedDrives(): def doPrintShowOrgunitSharedDrives(): def _getOrgUnitSharedDriveInfo(shareddrive): shareddrive['driveId'] = shareddrive['name'].rsplit(';')[1] - shareddrive['driveName'] = _getSharedDriveNameFromId(shareddrive['driveId']) + shareddrive['driveName'] = _getSharedDriveNameFromId(drive, shareddrive['driveId'], True) shareddrive['orgUnitPath'] = orgUnitPath def _showOrgUnitSharedDrive(shareddrive, j, jcount, FJQC): @@ -65600,13 +65594,13 @@ def doPrintShowOrgunitSharedDrives(): printEntity([Ent.MEMBER_URI, shareddrive['memberUri']]) printEntity([Ent.SHAREDDRIVE_ID, shareddrive['driveId']]) printEntity([Ent.SHAREDDRIVE_NAME, shareddrive['driveName']]) - printEntity([Ent.ORGANIZATIONAL_UNIT, shareddrive['orgUnit']]) + printEntity([Ent.ORGANIZATIONAL_UNIT, shareddrive['orgUnitPath']]) Ind.Decrement() ci = buildGAPIObject(API.CLOUDIDENTITY_ORGUNITS_BETA) cd = buildGAPIObject(API.DIRECTORY) - _, GM.Globals[GM.ADMIN_DRIVE] = buildGAPIServiceObject(API.DRIVE3, _getAdminEmail()) - if not GM.Globals[GM.ADMIN_DRIVE]: + _, drive = buildGAPIServiceObject(API.DRIVE3, _getAdminEmail()) + if drive is None: return csvPF = CSVPrintFile(['name', 'type', 'member', 'memberUri', 'driveId', 'driveName', 'orgUnitPath']) if Act.csvFormat() else None FJQC = FormatJSONQuoteChar(csvPF) @@ -65685,13 +65679,13 @@ def copySyncSharedDriveACLs(users, useDomainAdminAccess=False): if not drive: continue if not srcFileIdEntity.get('shareddrivename'): - srcFileIdEntity['shareddrivename'] = _getSharedDriveNameFromId(srcFileIdEntity['shareddrive']['driveId']) + srcFileIdEntity['shareddrivename'] = _getSharedDriveNameFromId(drive, srcFileIdEntity['shareddrive']['driveId']) if tgtFileIdEntity.get('shareddrivename'): if not _convertSharedDriveNameToId(drive, user, i, count, tgtFileIdEntity, useDomainAdminAccess): continue tgtFileIdEntity['shareddrive']['corpora'] = 'drive' else: - tgtFileIdEntity['shareddrivename'] = _getSharedDriveNameFromId(tgtFileIdEntity['shareddrive']['driveId']) + tgtFileIdEntity['shareddrivename'] = _getSharedDriveNameFromId(drive, tgtFileIdEntity['shareddrive']['driveId']) statistics = _initStatistics() copyMoveOptions['sourceDriveId'] = srcFileIdEntity['shareddrive']['driveId'] copyMoveOptions['destDriveId'] = tgtFileIdEntity['shareddrive']['driveId'] diff --git a/src/gam/gamlib/glcfg.py b/src/gam/gamlib/glcfg.py index 337e2b80..8467eb81 100644 --- a/src/gam/gamlib/glcfg.py +++ b/src/gam/gamlib/glcfg.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2024 Ross Scroggs All Rights Reserved. +# Copyright (C) 2025 Ross Scroggs All Rights Reserved. # # All Rights Reserved. # @@ -260,12 +260,12 @@ SMTP_HOST = 'smtp_host' SMTP_USERNAME = 'smtp_username' # SMTP password SMTP_PASSWORD = 'smtp_password' +# Time Zone +TIMEZONE = 'timezone' ## Minimum TLS Version required for HTTPS connections TLS_MIN_VERSION = 'tls_min_version' ## Maximum TLS Version used for HTTPS connections TLS_MAX_VERSION = 'tls_max_version' -# Time Zone -TIMEZONE = 'timezone' # Clear basic filter when updating an existing sheet TODRIVE_CLEARFILTER = 'todrive_clearfilter' # Use client access for todrive @@ -431,9 +431,9 @@ Defaults = { SMTP_HOST: '', SMTP_USERNAME: '', SMTP_PASSWORD: '', + TIMEZONE: 'utc', TLS_MIN_VERSION: 'TLSv1_3', TLS_MAX_VERSION: '', - TIMEZONE: 'utc', TODRIVE_CLEARFILTER: FALSE, TODRIVE_CLIENTACCESS: FALSE, TODRIVE_CONVERSION: TRUE, @@ -599,9 +599,9 @@ VAR_INFO = { SMTP_HOST: {VAR_TYPE: TYPE_STRING, VAR_LIMITS: (0, None)}, SMTP_USERNAME: {VAR_TYPE: TYPE_STRING, VAR_LIMITS: (0, None)}, SMTP_PASSWORD: {VAR_TYPE: TYPE_PASSWORD, VAR_LIMITS: (0, None)}, + TIMEZONE: {VAR_TYPE: TYPE_TIMEZONE}, TLS_MIN_VERSION: {VAR_TYPE: TYPE_CHOICE, VAR_ENVVAR: 'GAM_TLS_MIN_VERSION', VAR_CHOICES: TLS_CHOICE_MAP}, TLS_MAX_VERSION: {VAR_TYPE: TYPE_CHOICE, VAR_ENVVAR: 'GAM_TLS_MAX_VERSION', VAR_CHOICES: TLS_CHOICE_MAP}, - TIMEZONE: {VAR_TYPE: TYPE_TIMEZONE}, TODRIVE_CLEARFILTER: {VAR_TYPE: TYPE_BOOLEAN}, TODRIVE_CLIENTACCESS: {VAR_TYPE: TYPE_BOOLEAN}, TODRIVE_CONVERSION: {VAR_TYPE: TYPE_BOOLEAN}, diff --git a/src/gam/gamlib/glglobals.py b/src/gam/gamlib/glglobals.py index 07750dd9..d9756d14 100644 --- a/src/gam/gamlib/glglobals.py +++ b/src/gam/gamlib/glglobals.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2023 Ross Scroggs All Rights Reserved. +# Copyright (C) 2025 Ross Scroggs All Rights Reserved. # # All Rights Reserved. # @@ -25,8 +25,6 @@ # Some commands want to set a non-zero return code but not bail # GAM admin user from oauth2.txt or oauth2service.json ADMIN = 'admn' -# Drive service for admin; used to look up Shared Drive Names -ADMIN_DRIVE = 'addr' # Number/length of API call retries API_CALLS_RETRY_DATA = 'rtry' # GAM cache directory. If no_cache is True, this variable will be set to None @@ -220,7 +218,6 @@ REDIRECT_QUEUE_EOF = 'eof' # Globals = { ADMIN: None, - ADMIN_DRIVE: None, API_CALLS_RETRY_DATA: {}, CACHE_DIR: None, CACHE_DISCOVERY_ONLY: True,