From a94f64d037f4b060a3fb25f0d601f48707cf66ba Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 10 Feb 2015 16:20:23 +0100 Subject: Fix regexp to fix a python bug * http://bugs.python.org/issue18647#msg194412 --- archaeological_operations/data_importer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'archaeological_operations/data_importer.py') diff --git a/archaeological_operations/data_importer.py b/archaeological_operations/data_importer.py index 2c016b588..4c75ba53d 100644 --- a/archaeological_operations/data_importer.py +++ b/archaeological_operations/data_importer.py @@ -138,10 +138,10 @@ class SurfaceFormater(Formater): #RE_ADD_CD_POSTAL_TOWN = re.compile("(.*)[, ](\d{5}) (.*?) *(?: "\ # "*CEDEX|cedex|Cedex *\d*)*") -RE_NAME_ADD_CD_POSTAL_TOWN = re.compile("(.*)?[, ]*" + NEW_LINE_BREAK \ - + "(.*)?[, ]*(\d{2} *\d{3})[, ]*(.+)") +RE_NAME_ADD_CD_POSTAL_TOWN = re.compile("(.+)?[, ]*" + NEW_LINE_BREAK \ + + "(.+)?[, ]*(\d{2} *\d{3})[, ]*(.+)") -RE_ADD_CD_POSTAL_TOWN = re.compile("(.*)?[, ]*(\d{2} *\d{3})[, ]*(.+)") +RE_ADD_CD_POSTAL_TOWN = re.compile("(.+)?[, ]*(\d{2} *\d{3})[, ]*(.+)") RE_CD_POSTAL_FILTER = re.compile("(\d*) (\d*)") -- cgit v1.2.3