From: Martin v. Löwis Date: Sat, 5 Jan 2002 11:33:55 +0000 (+0000) Subject: Check for time.struct_time in addition to tuples. Use 3 characters X-Git-Tag: v2.2.1c1~248 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=95789f8db8c67419cad143b2602ea3e86e4d8978;p=thirdparty%2FPython%2Fcpython.git Check for time.struct_time in addition to tuples. Use 3 characters for zone hours. Fixes #499169. --- diff --git a/Lib/imaplib.py b/Lib/imaplib.py index cbcf107dc60c..ed785ed3d42c 100644 --- a/Lib/imaplib.py +++ b/Lib/imaplib.py @@ -1069,12 +1069,12 @@ def Time2Internaldate(date_time): Return string in form: '"DD-Mmm-YYYY HH:MM:SS +HHMM"' """ - dttype = type(date_time) - if dttype is type(1) or dttype is type(1.1): + if isinstance(date_time, int) or isinstance(date_time, float): tt = time.localtime(date_time) - elif dttype is type(()): + elif isinstance(date_time, tuple) or \ + isinstance(date_time, time.struct_time): tt = date_time - elif dttype is type(""): + elif isinstance(date_time, str): return date_time # Assume in correct format else: raise ValueError @@ -1085,7 +1085,7 @@ def Time2Internaldate(date_time): zone = -time.altzone else: zone = -time.timezone - return '"' + dt + " %+02d%02d" % divmod(zone/60, 60) + '"' + return '"' + dt + " %+03d%02d" % divmod(zone/60, 60) + '"'