← Back to branch summary

~rosco2/ubuntu/wily/gramps/bug-1492304

« back to all changes in this revision

Viewing changes to gramps/gui/views/treemodels/familymodel.py

  • Committer: Package Import Robot
  • Author(s): Ross Gammon
  • Date: 2015-08-11 23:03:11 UTC
  • mfrom: (1.4.3)
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: package-import@ubuntu.com-20150811230311-acjr8gcfe8isx7ij
https://launchpad.net/bugs/1464845
https://launchpad.net/bugs/1451259
* New upstream release
* Drop patches applied upstream or cherry-picked from there
* Add version constraints for gtk and pygobject
* Add goocanvas dependency - available soon
* Drop webkit dpendency as HTML view has been removed
* Force removal of upstream packages when installing Debian one
  (LP: #1464845)
* Drop fixperm override as permissions fixed upstream
* Fix spelling error in changelog
* Switch to nose for unit tests
* Add build dependencies for the nose tests
* Update copyright file
* Add uversionmangle to watch file to deal with alpha/beta versions
* Add manual test cases
* Drop FAQ URL from upstream metadata - changes every release
* Add patch to fix transparent windows in Ubuntu.
  Thanks to Lance Orner (LP: #1451259)

Show diffs side-by-side

added added

removed removed

Lines of Context:
gramps/gui/views/treemodels/familymodel.py
45
45
from .flatbasemodel import FlatBaseModel
46
46
from gramps.gen.utils.db import get_marriage_or_fallback
47
47
from gramps.gen.config import config
48
 
from gramps.gen.constfunc import cuni
49
48
from gramps.gen.const import GRAMPS_LOCALE as glocale
50
49
 
51
50
invalid_date_format = config.get('preferences.invalid-date-format')
135
134
            return ""
136
135
 
137
136
    def column_type(self, data):
138
 
        return cuni(FamilyRelType(data[5]))
 
137
        return str(FamilyRelType(data[5]))
139
138
 
140
139
    def column_marriage(self, data):
141
140
        family = self.db.get_family_from_handle(data[0])
159
158
            return ''
160
159
 
161
160
    def column_id(self, data):
162
 
        return cuni(data[1])
 
161
        return str(data[1])
163
162
 
164
163
    def column_private(self, data):
165
164
        if data[14]: