|
|
|
@ -1194,6 +1194,11 @@ def unified_timestamp(date_str, day_first=True):
|
|
|
|
|
# Remove AM/PM + timezone
|
|
|
|
|
date_str = re.sub(r'(?i)\s*(?:AM|PM)(?:\s+[A-Z]+)?', '', date_str)
|
|
|
|
|
|
|
|
|
|
# Remove unrecognized timezones from ISO 8601 alike timestamps
|
|
|
|
|
m = re.search(r'\d{1,2}:\d{1,2}(?:\.\d+)?(?P<tz>\s*[A-Z]+)$', date_str)
|
|
|
|
|
if m:
|
|
|
|
|
date_str = date_str[:-len(m.group('tz'))]
|
|
|
|
|
|
|
|
|
|
for expression in date_formats(day_first):
|
|
|
|
|
try:
|
|
|
|
|
dt = datetime.datetime.strptime(date_str, expression) - timezone + datetime.timedelta(hours=pm_delta)
|
|
|
|
|