From ad79a3f1bbb2859055f53431c0c3369580f280ab Mon Sep 17 00:00:00 2001 From: Paul Franklin Date: Tue, 9 Jul 2013 01:31:42 +0000 Subject: [PATCH] standardize date handler's internal argument names, for easier comparisons svn: r22666 --- gramps/gen/datehandler/_date_sr.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gramps/gen/datehandler/_date_sr.py b/gramps/gen/datehandler/_date_sr.py index c84b045bc..fe9ee9192 100644 --- a/gramps/gen/datehandler/_date_sr.py +++ b/gramps/gen/datehandler/_date_sr.py @@ -216,15 +216,15 @@ class DateParserSR(DateParser): # match Day.Month.Year. self._numeric = re.compile("((\d+)[/\. ])?\s*((\d+)[/\.])?\s*(\d+)\.?$") - _span1 = ['od', 'од'] - _span2 = ['do', 'до'] - _range1 = ['između', 'између'] - _range2 = ['i', 'и'] - self._span = re.compile("(%s)\s+(?P.+)\s+(%s)\s+(?P.+)" % - ('|'.join(_span1),'|'.join(_span2)), + _span_1 = ['od', 'од'] + _span_2 = ['do', 'до'] + _range_1 = ['između', 'између'] + _range_2 = ['i', 'и'] + self._span = re.compile("(%s)\s+(?P.+)\s+(%s)\s+(?P.+)" % + ('|'.join(_span_1),'|'.join(_span_2)), re.IGNORECASE) - self._range = re.compile("(%s)\s+(?P.+)\s+(%s)\s+(?P.+)" % - ('|'.join(_range1),'|'.join(_range2)), + self._range = re.compile("(%s)\s+(?P.+)\s+(%s)\s+(?P.+)" % + ('|'.join(_range_1),'|'.join(_range_2)), re.IGNORECASE) #-------------------------------------------------------------------------