Skip to content

Commit 7f6fa88

Browse files
daviddrysdaledaviddrysdale
committed
Merge code changes from upstream r663
1 parent c6398ae commit 7f6fa88

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

‎python/phonenumbers/phonenumbermatcher.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def _limit(lower, upper):
135135

136136
# Matches timestamps. Examples: "2012-01-02 08:00". Note that the reg-ex does
137137
# not include the trailing ":\d\d" -- that is covered by TIME_STAMPS_SUFFIX.
138-
_TIME_STAMPS = re.compile(u("[12]\\d{3}[-/]?[01]\\d[-/]?[0-3]\\d [0-2]\\d$"))
138+
_TIME_STAMPS = re.compile(u("[12]\\d{3}[-/]?[01]\\d[-/]?[0-3]\\d +[0-2]\\d$"))
139139
_TIME_STAMPS_SUFFIX = re.compile(u(":[0-5]\\d"))
140140

141141
# Patterns used to extract phone numbers from a larger phone-number-like

‎python/tests/phonenumbermatchertest.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ def __str__(self):
134134
NumberTest("2012-01-02 08:00", "US"),
135135
NumberTest("2012/01/02 08:00", "US"),
136136
NumberTest("20120102 08:00", "US"),
137+
NumberTest("2014-04-12 04:04 PM", "US"),
138+
NumberTest("2014-04-12  04:04 PM", "US"),
139+
NumberTest("2014-04-12  04:04 PM", "US"),
140+
NumberTest("2014-04-12 04:04 PM", "US"),
137141
]
138142

139143
# Strings with number-like things that should only be found under "possible".

0 commit comments

Comments
 (0)