[PATCH 3 of 3 V2] py3: convert date and format arguments str before passing in time.strptime
Pulkit Goyal
7895pulkit at gmail.com
Mon May 15 13:50:48 EDT 2017
# HG changeset patch
# User Pulkit Goyal <7895pulkit at gmail.com>
# Date 1494026485 -19800
# Sat May 06 04:51:25 2017 +0530
# Node ID bffb17a42e8c185bb3d31f4489066448ce2e259a
# Parent 75245b989dd661164041794620770ad7726fe9cd
py3: convert date and format arguments str before passing in time.strptime
time.strptime() raises ValueError if the arguments are not str.
Source Code: https://hg.python.org/cpython/file/3.5/Lib/_strptime.py#l307
diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -1937,7 +1937,8 @@
# elements are relative to today
usenow = True
- timetuple = time.strptime(date, format)
+ timetuple = time.strptime(encoding.strfromlocal(date),
+ encoding.strfromlocal(format))
localunixtime = int(calendar.timegm(timetuple))
if offset is None:
# local timezone
More information about the Mercurial-devel
mailing list