summaryrefslogtreecommitdiff
path: root/Lib/_strptime.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-08-17 15:53:55 +0300
committerEzio Melotti <ezio.melotti@gmail.com>2013-08-17 15:53:55 +0300
commit20bb8581bd5ed082be781ce6d24b7b7b6b19cebc (patch)
treeb5a6e220e3fdc56743b5e8ac14cbc7a566b61e12 /Lib/_strptime.py
parent6a8989e6913b62b6dcda6b6aaa7eec7d8edda3e0 (diff)
parent88e1e502c6427f30079d18813c6a5df92112a0ae (diff)
downloadcpython-20bb8581bd5ed082be781ce6d24b7b7b6b19cebc.tar.gz
#18705: merge with 3.3.
Diffstat (limited to 'Lib/_strptime.py')
-rw-r--r--Lib/_strptime.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/_strptime.py b/Lib/_strptime.py
index 7520919806..3884a670b8 100644
--- a/Lib/_strptime.py
+++ b/Lib/_strptime.py
@@ -225,7 +225,7 @@ class TimeRE(dict):
"""Convert a list to a regex string for matching a directive.
Want possible matching values to be from longest to shortest. This
- prevents the possibility of a match occuring for a value that also
+ prevents the possibility of a match occurring for a value that also
a substring of a larger value that should have matched (e.g., 'abc'
matching when 'abcdef' should have been the match).