summaryrefslogtreecommitdiffstats
path: root/Lib/datetime.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-10-19 08:06:26 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-10-19 08:06:26 (GMT)
commitf10644983e88c73437703a863151593cc37a657f (patch)
treeb3cf3ffcc4d27cf9f81c90efbedbc10a856db857 /Lib/datetime.py
parent318909b297241f9c46f25815e12d05136da57fa9 (diff)
parente130a52d8a60229f53c8bc2ea7a1f51ee592bbd7 (diff)
downloadcpython-f10644983e88c73437703a863151593cc37a657f.zip
cpython-f10644983e88c73437703a863151593cc37a657f.tar.gz
cpython-f10644983e88c73437703a863151593cc37a657f.tar.bz2
Merge with 3.2.
Diffstat (limited to 'Lib/datetime.py')
-rw-r--r--Lib/datetime.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/datetime.py b/Lib/datetime.py
index 1f8c8f7..c5eeca4 100644
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -2053,7 +2053,7 @@ z' = z + z.d = 1:MM then, and z'.d=0, and z'.d - z.d = -60 != 0 so [8]
Because we know z.d said z was in daylight time (else [5] would have held and
we would have stopped then), and we know z.d != z'.d (else [8] would have held
-and we we have stopped then), and there are only 2 possible values dst() can
+and we have stopped then), and there are only 2 possible values dst() can
return in Eastern, it follows that z'.d must be 0 (which it is in the example,
but the reasoning doesn't depend on the example -- it depends on there being
two possible dst() outcomes, one zero and the other non-zero). Therefore