Skip to content

Commit

Permalink
object instead of raise
Browse files Browse the repository at this point in the history
  • Loading branch information
jbrockmendel committed Nov 9, 2023
1 parent db0d07e commit 9e11728
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion pandas/_libs/tslibs/strptime.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,10 @@ def array_strptime(
elif not utc:
if tz_out and (state.found_other or state.found_naive_str):
# found_other indicates a tz-naive int, float, dt64, or date
raise ValueError("Cannot mix tz-aware with tz-naive values")
result2 = _array_strptime_object_fallback(
values, fmt=fmt, exact=exact, errors=errors, utc=utc
)
return result2, None

if infer_reso:
if state.creso_ever_changed:
Expand Down

0 comments on commit 9e11728

Please sign in to comment.