sync gramps40 to trunk (two places)

svn: r21426

gramps/grampsapp.py

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

gramps/plugins/textreport/descendreport.py

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