2.0.6-2

svn: r5084

gramps2/configure.in

@@ -8,7 +8,7 @@ AC_INIT(gramps, 2.0.6, gramps-bugs@lists.sourceforge.net)
 AC_CONFIG_SRCDIR(src/gramps.py)
 AM_INIT_AUTOMAKE(1.6.3)
 dnl RELEASE=0.CVS$(head -c 10 ${srcdir}/ChangeLog | tr -d '-')
-RELEASE=1
+RELEASE=2
 
 VERSIONSTRING=$VERSION
 if test x"$RELEASE" != "x"

gramps2/src/DateParser.py

@@ -285,8 +285,6 @@ class DateParser:
                            re.IGNORECASE)
         self._itext2   = re.compile('(\d+)?\s+?%s\s*((\d+)(/\d+)?)?' % self._imon_str,
                            re.IGNORECASE)
-        self._range2   = re.compile('%s\s+(\d+)-(\d+)\s*,?\s*((\d+)(/\d+)?)?' % self._mon_str,
-                           re.IGNORECASE)
         self._numeric  = re.compile("((\d+)[/\.])?((\d+)[/\.])?(\d+)")
         self._iso      = re.compile("(\d+)-(\d+)-(\d+)")
         self._rfc      = re.compile("(%s,)?\s+(\d|\d\d)\s+%s\s+(\d+)\s+\d\d:\d\d(:\d\d)?\s+(\+|-)\d\d\d\d" 
@@ -476,31 +474,6 @@ class DateParser:
             return 1
         return 0
 
-    def match_range2(self,text,cal,qual,date):
-        """
-        Try matching numerical range date.
-        
-        On success, set the date and return 1. On failure return 0.
-        """
-        match = self._range2.match(text)
-        if match:
-            grps = match.groups()
-            m = self.month_to_int[grps[0].lower()]
-
-            d0 = self._get_int(grps[1])
-            d1 = self._get_int(grps[2])
-
-            if grps[3] == None:
-                y = 0
-                s = None
-            else:
-                y = int(grps[3])
-                s = grps[4] != None
-            date.set(qual,Date.MOD_RANGE,Date.CAL_GREGORIAN,
-                     (d0,m,y,s,d1,m,y,s))
-            return 1
-        return 0
-
     def match_bce(self,text):
         """
         Try matching BCE qualifier.
@@ -556,8 +529,6 @@ class DateParser:
             return
         if self.match_range(text,cal,qual,date):
             return
-        if self.match_range2(text,cal,qual,date):
-            return
 
         (text,bc) = self.match_bce(text)
         if self.match_modifier(text,cal,qual,bc,date):

gramps2/src/ReadXML.py

@@ -754,8 +754,6 @@ class GrampsParser:
             family = self.db.find_family_from_handle(attrs['hlink'],self.trans)
         except KeyError:
             family = self.find_family_by_gramps_id(self.map_fid(attrs["ref"]))
-        if attrs["ref"] == "F60":
-            print family.get_handle(),self.person.get_gramps_id()
         self.person.add_family_handle(family.get_handle())
 
     def start_name(self,attrs):