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

iso8601.parse_date does not return separate tz anymore. #1829

Browse Source
This commit is contained in:
Jay Lee
2025-09-05 21:18:34 +00:00
parent 3befbf4419
commit 4fb7448d40
1 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/gam/__init__.py
View File

@@ -2013,11 +2013,11 @@ def getTimeOrDeltaFromNow(returnDateTime=False):
except OverflowError: except OverflowError:
pass pass
try: try:
fullDateTime, tz = iso8601.parse_date(argstr) fullDateTime = iso8601.parse_date(argstr)
Cmd.Advance() Cmd.Advance()
if not returnDateTime: if not returnDateTime:
return argstr.replace(' ', 'T') return argstr.replace(' ', 'T')
return (fullDateTime, tz, argstr.replace(' ', 'T')) return (fullDateTime, fullDateTime.tzinfo, argstr.replace(' ', 'T'))
except (iso8601.ParseError, OverflowError): except (iso8601.ParseError, OverflowError):
pass pass
invalidArgumentExit(YYYYMMDDTHHMMSS_FORMAT_REQUIRED) invalidArgumentExit(YYYYMMDDTHHMMSS_FORMAT_REQUIRED)
@@ -2335,7 +2335,7 @@ def formatLocalTime(dateTimeStr):
if dateTimeStr in {NEVER_TIME, NEVER_TIME_NOMS}: if dateTimeStr in {NEVER_TIME, NEVER_TIME_NOMS}:
return GC.Values[GC.NEVER_TIME] return GC.Values[GC.NEVER_TIME]
try: try:
timestamp, _ = iso8601.parse_date(dateTimeStr) timestamp = iso8601.parse_date(dateTimeStr)
if not GC.Values[GC.OUTPUT_TIMEFORMAT]: if not GC.Values[GC.OUTPUT_TIMEFORMAT]:
if GM.Globals[GM.CONVERT_TO_LOCAL_TIME]: if GM.Globals[GM.CONVERT_TO_LOCAL_TIME]:
return ISOformatTimeStamp(timestamp.astimezone(GC.Values[GC.TIMEZONE])) return ISOformatTimeStamp(timestamp.astimezone(GC.Values[GC.TIMEZONE]))
@@ -7436,7 +7436,7 @@ def RowFilterMatch(row, titlesList, rowFilter, rowFilterModeAll, rowDropFilter,
return None return None
else: else:
try: try:
rowTime, _ = iso8601.parse_date(rowDate) rowTime = iso8601.parse_date(rowDate)
except (iso8601.ParseError, OverflowError): except (iso8601.ParseError, OverflowError):
return None return None
return ISOformatTimeStamp(datetime.datetime(rowTime.year, rowTime.month, rowTime.day, tzinfo=iso8601.UTC)) return ISOformatTimeStamp(datetime.datetime(rowTime.year, rowTime.month, rowTime.day, tzinfo=iso8601.UTC))
@@ -7501,7 +7501,7 @@ def RowFilterMatch(row, titlesList, rowFilter, rowFilterModeAll, rowDropFilter,
if YYYYMMDD_PATTERN.match(rowDate): if YYYYMMDD_PATTERN.match(rowDate):
return None return None
try: try:
rowTime, _ = iso8601.parse_date(rowDate) rowTime = iso8601.parse_date(rowDate)
except (iso8601.ParseError, OverflowError): except (iso8601.ParseError, OverflowError):
return None return None
return f'{rowTime.hour:02d}:{rowTime.minute:02d}' return f'{rowTime.hour:02d}:{rowTime.minute:02d}'
@@ -12413,7 +12413,7 @@ def checkServiceAccount(users):
throwReasons=[GAPI.BAD_REQUEST, GAPI.INVALID, GAPI.NOT_FOUND, throwReasons=[GAPI.BAD_REQUEST, GAPI.INVALID, GAPI.NOT_FOUND,
GAPI.PERMISSION_DENIED, GAPI.SERVICE_NOT_AVAILABLE], GAPI.PERMISSION_DENIED, GAPI.SERVICE_NOT_AVAILABLE],
name=name, fields='validAfterTime') name=name, fields='validAfterTime')
key_created, _ = iso8601.parse_date(key['validAfterTime']) key_created = iso8601.parse_date(key['validAfterTime'])
key_age = todaysTime()-key_created key_age = todaysTime()-key_created
printPassFail(Msg.SERVICE_ACCOUNT_PRIVATE_KEY_AGE.format(key_age.days), testWarn if key_age.days > 30 else testPass) printPassFail(Msg.SERVICE_ACCOUNT_PRIVATE_KEY_AGE.format(key_age.days), testWarn if key_age.days > 30 else testPass)
except GAPI.permissionDenied: except GAPI.permissionDenied:
@@ -14368,7 +14368,7 @@ def doReport():
eventTime = activity.get('id', {}).get('time', UNKNOWN) eventTime = activity.get('id', {}).get('time', UNKNOWN)
if eventTime != UNKNOWN: if eventTime != UNKNOWN:
try: try:
eventTime, _ = iso8601.parse_date(eventTime) eventTime = iso8601.parse_date(eventTime)
except (iso8601.ParseError, OverflowError): except (iso8601.ParseError, OverflowError):
eventTime = UNKNOWN eventTime = UNKNOWN
if eventTime != UNKNOWN: if eventTime != UNKNOWN:
@@ -23867,7 +23867,7 @@ def _filterDeviceFiles(cros, selected, listLimit, startTime, endTime):
filteredItems = [] filteredItems = []
i = 0 i = 0
for item in cros.get('deviceFiles', []): for item in cros.get('deviceFiles', []):
timeValue, _ = iso8601.parse_date(item['createTime']) timeValue = iso8601.parse_date(item['createTime'])
if ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)): if ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)):
item['createTime'] = formatLocalTime(item['createTime']) item['createTime'] = formatLocalTime(item['createTime'])
filteredItems.append(item) filteredItems.append(item)
@@ -23884,7 +23884,7 @@ def _filterCPUStatusReports(cros, selected, listLimit, startTime, endTime):
filteredItems = [] filteredItems = []
i = 0 i = 0
for item in cros.get('cpuStatusReports', []): for item in cros.get('cpuStatusReports', []):
timeValue, _ = iso8601.parse_date(item['reportTime']) timeValue = iso8601.parse_date(item['reportTime'])
if ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)): if ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)):
item['reportTime'] = formatLocalTime(item['reportTime']) item['reportTime'] = formatLocalTime(item['reportTime'])
for tempInfo in item.get('cpuTemperatureInfo', []): for tempInfo in item.get('cpuTemperatureInfo', []):
@@ -23905,7 +23905,7 @@ def _filterSystemRamFreeReports(cros, selected, listLimit, startTime, endTime):
filteredItems = [] filteredItems = []
i = 0 i = 0
for item in cros.get('systemRamFreeReports', []): for item in cros.get('systemRamFreeReports', []):
timeValue, _ = iso8601.parse_date(item['reportTime']) timeValue = iso8601.parse_date(item['reportTime'])
if ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)): if ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)):
item['reportTime'] = formatLocalTime(item['reportTime']) item['reportTime'] = formatLocalTime(item['reportTime'])
item['systemRamFreeInfo'] = ','.join([str(x) for x in item['systemRamFreeInfo']]) item['systemRamFreeInfo'] = ','.join([str(x) for x in item['systemRamFreeInfo']])
@@ -23938,7 +23938,7 @@ def _filterScreenshotFiles(cros, selected, listLimit, startTime, endTime):
filteredItems = [] filteredItems = []
i = 0 i = 0
for item in cros.get('screenshotFiles', []): for item in cros.get('screenshotFiles', []):
timeValue, _ = iso8601.parse_date(item['createTime']) timeValue = iso8601.parse_date(item['createTime'])
if ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)): if ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)):
item['createTime'] = formatLocalTime(item['createTime']) item['createTime'] = formatLocalTime(item['createTime'])
filteredItems.append(item) filteredItems.append(item)
@@ -24386,7 +24386,7 @@ def getDeviceFilesEntity():
else: else:
for timeItem in myarg.split(','): for timeItem in myarg.split(','):
try: try:
timestamp, _ = iso8601.parse_date(timeItem) timestamp = iso8601.parse_date(timeItem)
deviceFilesEntity['list'].append(ISOformatTimeStamp(timestamp.astimezone(GC.Values[GC.TIMEZONE]))) deviceFilesEntity['list'].append(ISOformatTimeStamp(timestamp.astimezone(GC.Values[GC.TIMEZONE])))
except (iso8601.ParseError, OverflowError): except (iso8601.ParseError, OverflowError):
Cmd.Backup() Cmd.Backup()
@@ -24415,14 +24415,14 @@ def _selectDeviceFiles(deviceId, deviceFiles, deviceFilesEntity):
count = 0 count = 0
if deviceFilesEntity['time'][0] == 'before': if deviceFilesEntity['time'][0] == 'before':
for deviceFile in deviceFiles: for deviceFile in deviceFiles:
createTime, _ = iso8601.parse_date(deviceFile['createTime']) createTime = iso8601.parse_date(deviceFile['createTime'])
if createTime >= dateTime: if createTime >= dateTime:
break break
count += 1 count += 1
return deviceFiles[:count] return deviceFiles[:count]
# if deviceFilesEntity['time'][0] == 'after': # if deviceFilesEntity['time'][0] == 'after':
for deviceFile in deviceFiles: for deviceFile in deviceFiles:
createTime, _ = iso8601.parse_date(deviceFile['createTime']) createTime = iso8601.parse_date(deviceFile['createTime'])
if createTime >= dateTime: if createTime >= dateTime:
break break
count += 1 count += 1
@@ -24431,14 +24431,14 @@ def _selectDeviceFiles(deviceId, deviceFiles, deviceFilesEntity):
dateTime = deviceFilesEntity['range'][1] dateTime = deviceFilesEntity['range'][1]
spos = 0 spos = 0
for deviceFile in deviceFiles: for deviceFile in deviceFiles:
createTime, _ = iso8601.parse_date(deviceFile['createTime']) createTime = iso8601.parse_date(deviceFile['createTime'])
if createTime >= dateTime: if createTime >= dateTime:
break break
spos += 1 spos += 1
dateTime = deviceFilesEntity['range'][2] dateTime = deviceFilesEntity['range'][2]
epos = spos epos = spos
for deviceFile in deviceFiles[spos:]: for deviceFile in deviceFiles[spos:]:
createTime, _ = iso8601.parse_date(deviceFile['createTime']) createTime = iso8601.parse_date(deviceFile['createTime'])
if createTime >= dateTime: if createTime >= dateTime:
break break
epos += 1 epos += 1
@@ -25221,7 +25221,7 @@ def doInfoPrintShowCrOSTelemetry():
i = 0 i = 0
for item in listItems: for item in listItems:
if 'reportTime' in item: if 'reportTime' in item:
timeValue, _ = iso8601.parse_date(item['reportTime']) timeValue = iso8601.parse_date(item['reportTime'])
else: else:
timeValue = None timeValue = None
if (timeValue is None) or (((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime))): if (timeValue is None) or (((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime))):
@@ -40068,7 +40068,7 @@ def _getEventDaysOfWeek(event):
pass pass
elif 'dateTime' in event[attr]: elif 'dateTime' in event[attr]:
try: try:
dateTime, _ = iso8601.parse_date(event[attr]['dateTime']) dateTime = iso8601.parse_date(event[attr]['dateTime'])
event[attr]['dayOfWeek'] = calendarlib.day_abbr[dateTime.weekday()] event[attr]['dayOfWeek'] = calendarlib.day_abbr[dateTime.weekday()]
except (iso8601.ParseError, OverflowError): except (iso8601.ParseError, OverflowError):
pass pass
@@ -48699,7 +48699,7 @@ def _courseItemPassesFilter(item, courseItemFilter):
return False return False
startTime = courseItemFilter['startTime'] startTime = courseItemFilter['startTime']
endTime = courseItemFilter['endTime'] endTime = courseItemFilter['endTime']
timeValue, _ = iso8601.parse_date(timeStr) timeValue = iso8601.parse_date(timeStr)
return ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime)) return ((startTime is None) or (timeValue >= startTime)) and ((endTime is None) or (timeValue <= endTime))
def _gettingCoursesQuery(courseSelectionParameters): def _gettingCoursesQuery(courseSelectionParameters):
@@ -56258,7 +56258,7 @@ def _selectRevisionIds(drive, fileId, origUser, user, i, count, j, jcount, revis
count = 0 count = 0
if revisionsEntity['time'][0] == 'before': if revisionsEntity['time'][0] == 'before':
for revision in results: for revision in results:
modifiedDateTime, _ = iso8601.parse_date(revision['modifiedTime']) modifiedDateTime = iso8601.parse_date(revision['modifiedTime'])
if modifiedDateTime >= dateTime: if modifiedDateTime >= dateTime:
break break
revisionIds.append(revision['id']) revisionIds.append(revision['id'])
@@ -56268,7 +56268,7 @@ def _selectRevisionIds(drive, fileId, origUser, user, i, count, j, jcount, revis
return revisionIds return revisionIds
# time: after # time: after
for revision in results: for revision in results:
modifiedDateTime, _ = iso8601.parse_date(revision['modifiedTime']) modifiedDateTime = iso8601.parse_date(revision['modifiedTime'])
if modifiedDateTime >= dateTime: if modifiedDateTime >= dateTime:
revisionIds.append(revision['id']) revisionIds.append(revision['id'])
count += 1 count += 1
@@ -56280,7 +56280,7 @@ def _selectRevisionIds(drive, fileId, origUser, user, i, count, j, jcount, revis
endDateTime = revisionsEntity['range'][2] endDateTime = revisionsEntity['range'][2]
count = 0 count = 0
for revision in results: for revision in results:
modifiedDateTime, _ = iso8601.parse_date(revision['modifiedTime']) modifiedDateTime = iso8601.parse_date(revision['modifiedTime'])
if modifiedDateTime >= startDateTime: if modifiedDateTime >= startDateTime:
if modifiedDateTime >= endDateTime: if modifiedDateTime >= endDateTime:
break break
@@ -56490,7 +56490,7 @@ def _selectRevisionResults(results, fileId, origUser, revisionsEntity, previewDe
count = 0 count = 0
if revisionsEntity['time'][0] == 'before': if revisionsEntity['time'][0] == 'before':
for revision in results: for revision in results:
modifiedDateTime, _ = iso8601.parse_date(revision['modifiedTime']) modifiedDateTime = iso8601.parse_date(revision['modifiedTime'])
if modifiedDateTime >= dateTime: if modifiedDateTime >= dateTime:
break break
count += 1 count += 1
@@ -56501,7 +56501,7 @@ def _selectRevisionResults(results, fileId, origUser, revisionsEntity, previewDe
return results[:count] return results[:count]
# time: after # time: after
for revision in results: for revision in results:
modifiedDateTime, _ = iso8601.parse_date(revision['modifiedTime']) modifiedDateTime = iso8601.parse_date(revision['modifiedTime'])
if modifiedDateTime >= dateTime: if modifiedDateTime >= dateTime:
break break
count += 1 count += 1
@@ -56518,7 +56518,7 @@ def _selectRevisionResults(results, fileId, origUser, revisionsEntity, previewDe
count = 0 count = 0
selectedResults = [] selectedResults = []
for revision in results: for revision in results:
modifiedDateTime, _ = iso8601.parse_date(revision['modifiedTime']) modifiedDateTime = iso8601.parse_date(revision['modifiedTime'])
if modifiedDateTime >= startDateTime: if modifiedDateTime >= startDateTime:
if modifiedDateTime >= endDateTime: if modifiedDateTime >= endDateTime:
break break
@@ -57056,7 +57056,7 @@ class PermissionMatch():
break break
elif field in {'expirationstart', 'expirationend'}: elif field in {'expirationstart', 'expirationend'}:
if 'expirationTime' in permission: if 'expirationTime' in permission:
expirationDateTime, _ = iso8601.parse_date(permission['expirationTime']) expirationDateTime = iso8601.parse_date(permission['expirationTime'])
if field == 'expirationstart': if field == 'expirationstart':
if expirationDateTime < value: if expirationDateTime < value:
break break