summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1998-02-18 05:06:30 (GMT)
committerGuido van Rossum <guido@python.org>1998-02-18 05:06:30 (GMT)
commit00455b77a66f78679f41e2b33955a439cb66316b (patch)
tree7c6384fc54bd2faf0d36268ab40ce686dfed9de3
parentd7300f8f568df7b3bdd170376ec79b68eab016eb (diff)
downloadcpython-00455b77a66f78679f41e2b33955a439cb66316b.zip
cpython-00455b77a66f78679f41e2b33955a439cb66316b.tar.gz
cpython-00455b77a66f78679f41e2b33955a439cb66316b.tar.bz2
Fix sign reversal in mktime_tz discovered by Bill van Melle.
-rw-r--r--Lib/rfc822.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/rfc822.py b/Lib/rfc822.py
index 9a99572e..f58543a 100644
--- a/Lib/rfc822.py
+++ b/Lib/rfc822.py
@@ -696,7 +696,7 @@ def mktime_tz(data):
"""
t = time.mktime(data[:8] + (0,))
- return t + data[9] - time.timezone
+ return t - data[9] - time.timezone
# When used as script, run a small test program.