summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2002-01-05 11:33:55 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2002-01-05 11:33:55 (GMT)
commit95789f8db8c67419cad143b2602ea3e86e4d8978 (patch)
tree9c86a0e789fe4f2ddf9d14d4c5fe85c4e7280161 /Lib
parentf63438ad81bc41a2bece664610c0e04608d19a0b (diff)
downloadcpython-95789f8db8c67419cad143b2602ea3e86e4d8978.zip
cpython-95789f8db8c67419cad143b2602ea3e86e4d8978.tar.gz
cpython-95789f8db8c67419cad143b2602ea3e86e4d8978.tar.bz2
Check for time.struct_time in addition to tuples. Use 3 characters
for zone hours. Fixes #499169.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/imaplib.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/imaplib.py b/Lib/imaplib.py
index cbcf107..ed785ed 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) + '"'