[PATCH 05 of 10] py3: convert date and format arguments str before passing in time.strptime

Pulkit Goyal 7895pulkit at gmail.com
Fri May 5 23:01:17 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 1a38d712f305b2dd5f2b2833cd78815ec3b383fd
# Parent  cfc021a731d59f713ffa1c54eb855d680125168b
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
@@ -1923,7 +1923,7 @@
             # elements are relative to today
             usenow = True
 
-    timetuple = time.strptime(date, format)
+    timetuple = time.strptime(pycompat.sysstr(date), pycompat.sysstr(format))
     localunixtime = int(calendar.timegm(timetuple))
     if offset is None:
         # local timezone


More information about the Mercurial-devel mailing list