sync gramps40 to trunk (two places)

svn: r21426
This commit is contained in:
Paul Franklin 2013-02-24 06:06:42 +00:00
parent 3d0fa7a00a
commit 123a6e0ecf
2 changed files with 1 additions and 2 deletions

View File

@ -320,7 +320,7 @@ def show_settings():
print (' pycairo : %s' % pycairover_str) print (' pycairo : %s' % pycairover_str)
print (' osmgpsmap : %s' % osmgpsmap_str) print (' osmgpsmap : %s' % osmgpsmap_str)
print (' GExiv2 : %s' % gexiv2_str) print (' GExiv2 : %s' % gexiv2_str)
print (' o.s. : %s' % operating_system) print (' o.s. : %s' % sys.platform)
if kernel: if kernel:
print (' kernel : %s' % kernel) print (' kernel : %s' % kernel)
print ('') print ('')

View File

@ -335,7 +335,6 @@ class DescendantReport(Report):
raise ReportError(_("Person %s is not in the Database") % pid ) raise ReportError(_("Person %s is not in the Database") % pid )
sort = Sort(self.database) sort = Sort(self.database)
self.by_birthdate = sort.by_birthdate_key
#Initialize the Printinfo class #Initialize the Printinfo class
self._showdups = menu.get_option_by_name('dups').get_value() self._showdups = menu.get_option_by_name('dups').get_value()