Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant str conversion in tree models

Browse Source
This commit is contained in:
Nick Hall 2015-12-02 12:27:17 +00:00
parent 4c22713a1a
commit 8c66825e84
8 changed files with 35 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gramps/gui/views/treemodels/citationbasemodel.py
View File

@ -109,13 +109,13 @@ class CitationBaseModel(object):
return '' return ''
def citation_id(self, data): def citation_id(self, data):
return str(data[COLUMN_ID]) return data[COLUMN_ID]
def citation_page(self, data): def citation_page(self, data):
return str(data[COLUMN_PAGE]) return data[COLUMN_PAGE]
def citation_confidence(self, data): def citation_confidence(self, data):
return str(_(conf_strings[data[COLUMN_CONFIDENCE]])) return _(conf_strings[data[COLUMN_CONFIDENCE]])
def citation_private(self, data): def citation_private(self, data):
if data[COLUMN_PRIV]: if data[COLUMN_PRIV]:
@ -164,7 +164,7 @@ class CitationBaseModel(object):
if not cached: if not cached:
try: try:
source = self.db.get_source_from_handle(source_handle) source = self.db.get_source_from_handle(source_handle)
value = str(source.get_title()) value = source.get_title()
except: except:
value = '' value = ''
self.set_cached_value(source_handle, "SRC_TITLE", value) self.set_cached_value(source_handle, "SRC_TITLE", value)
@ -176,7 +176,7 @@ class CitationBaseModel(object):
if not cached: if not cached:
try: try:
source = self.db.get_source_from_handle(source_handle) source = self.db.get_source_from_handle(source_handle)
value = str(source.gramps_id) value = source.gramps_id
except: except:
value = '' value = ''
self.set_cached_value(source_handle, "SRC_ID", value) self.set_cached_value(source_handle, "SRC_ID", value)
@ -188,7 +188,7 @@ class CitationBaseModel(object):
if not cached: if not cached:
try: try:
source = self.db.get_source_from_handle(source_handle) source = self.db.get_source_from_handle(source_handle)
value = str(source.get_author()) value = source.get_author()
except: except:
value = '' value = ''
self.set_cached_value(source_handle, "SRC_AUTH", value) self.set_cached_value(source_handle, "SRC_AUTH", value)
@ -200,7 +200,7 @@ class CitationBaseModel(object):
if not cached: if not cached:
try: try:
source = self.db.get_source_from_handle(source_handle) source = self.db.get_source_from_handle(source_handle)
value = str(source.get_abbreviation()) value = source.get_abbreviation()
except: except:
value = '' value = ''
self.set_cached_value(source_handle, "SRC_ABBR", value) self.set_cached_value(source_handle, "SRC_ABBR", value)
@ -212,7 +212,7 @@ class CitationBaseModel(object):
if not cached: if not cached:
try: try:
source = self.db.get_source_from_handle(source_handle) source = self.db.get_source_from_handle(source_handle)
value = str(source.get_publication_info()) value = source.get_publication_info()
except: except:
value = '' value = ''
self.set_cached_value(source_handle, "SRC_PINFO", value) self.set_cached_value(source_handle, "SRC_PINFO", value)
@ -262,19 +262,19 @@ class CitationBaseModel(object):
# Fields access when 'data' is a Source # Fields access when 'data' is a Source
def source_src_title(self, data): def source_src_title(self, data):
return str(data[COLUMN2_TITLE]) return data[COLUMN2_TITLE]
def source_src_id(self, data): def source_src_id(self, data):
return str(data[COLUMN2_ID]) return data[COLUMN2_ID]
def source_src_auth(self, data): def source_src_auth(self, data):
return str(data[COLUMN2_AUTHOR]) return data[COLUMN2_AUTHOR]
def source_src_abbr(self, data): def source_src_abbr(self, data):
return str(data[COLUMN2_ABBREV]) return data[COLUMN2_ABBREV]
def source_src_pinfo(self, data): def source_src_pinfo(self, data):
return str(data[COLUMN2_PUBINFO]) return data[COLUMN2_PUBINFO]
def source_src_private(self, data): def source_src_private(self, data):
if data[COLUMN2_PRIV]: if data[COLUMN2_PRIV]:

2
gramps/gui/views/treemodels/eventmodel.py
View File

@ -150,7 +150,7 @@ class EventModel(FlatBaseModel):
return str(EventType(data[COLUMN_TYPE])) return str(EventType(data[COLUMN_TYPE]))
def column_id(self,data): def column_id(self,data):
return str(data[COLUMN_ID]) return data[COLUMN_ID]
def column_date(self,data): def column_date(self,data):
if data[COLUMN_DATE]: if data[COLUMN_DATE]:

2
gramps/gui/views/treemodels/familymodel.py
View File

@ -188,7 +188,7 @@ class FamilyModel(FlatBaseModel):
return value return value
def column_id(self, data): def column_id(self, data):
return str(data[1]) return data[1]
def column_private(self, data): def column_private(self, data):
if data[14]: if data[14]:

25
gramps/gui/views/treemodels/mediamodel.py
View File

@ -43,7 +43,6 @@ from gi.repository import Gtk
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from gramps.gen.datehandler import displayer, format_time from gramps.gen.datehandler import displayer, format_time
from gramps.gen.lib import Date, MediaObject from gramps.gen.lib import Date, MediaObject
from gramps.gen.constfunc import conv_to_unicode
from gramps.gen.const import GRAMPS_LOCALE as glocale from gramps.gen.const import GRAMPS_LOCALE as glocale
from .flatbasemodel import FlatBaseModel from .flatbasemodel import FlatBaseModel
@ -106,40 +105,26 @@ class MediaModel(FlatBaseModel):
return len(self.fmap)+1 return len(self.fmap)+1
def column_description(self, data): def column_description(self, data):
descr = data[4] return data[4]
if isinstance(descr, str):
return descr
try:
return str(descr)
except:
return conv_to_unicode(descr, 'latin1')
def column_path(self, data): def column_path(self, data):
path = data[2] return data[2]
if isinstance(path, str):
return path
try:
return str(path)
except:
return str(path.encode('iso-8859-1'))
def column_mime(self, data): def column_mime(self, data):
mime = data[3] mime = data[3]
if mime and isinstance(mime, str):
return mime
if mime: if mime:
return str(mime) return mime
else: else:
return _('Note') return _('Note')
def column_id(self,data): def column_id(self,data):
return str(data[1]) return data[1]
def column_date(self,data): def column_date(self,data):
if data[10]: if data[10]:
date = Date() date = Date()
date.unserialize(data[10]) date.unserialize(data[10])
return str(displayer.display(date)) return displayer.display(date)
return '' return ''
def sort_date(self,data): def sort_date(self,data):

6
gramps/gui/views/treemodels/notemodel.py
View File

@ -101,7 +101,7 @@ class NoteModel(FlatBaseModel):
def column_id(self, data): def column_id(self, data):
"""Return the id of the Note.""" """Return the id of the Note."""
return str(data[Note.POS_ID]) return data[Note.POS_ID]
def column_type(self, data): def column_type(self, data):
"""Return the type of the Note in readable format.""" """Return the type of the Note in readable format."""
@ -111,9 +111,7 @@ class NoteModel(FlatBaseModel):
def column_preview(self, data): def column_preview(self, data):
"""Return a shortend version of the Note's text.""" """Return a shortend version of the Note's text."""
#data is the encoding in the database, make it a unicode object note = data[Note.POS_TEXT][StyledText.POS_TEXT]
#for universal work
note = str(data[Note.POS_TEXT][StyledText.POS_TEXT])
note = " ".join(note.split()) note = " ".join(note.split())
if len(note) > 80: if len(note) > 80:
return note[:80] + "..." return note[:80] + "..."

6
gramps/gui/views/treemodels/placemodel.py
View File

@ -126,7 +126,7 @@ class PlaceBaseModel(object):
return value return value
def column_name(self, data): def column_name(self, data):
return str(data[6][0]) return data[6][0]
def column_longitude(self, data): def column_longitude(self, data):
if not data[3]: if not data[3]:
@ -161,13 +161,13 @@ class PlaceBaseModel(object):
return value return value
def column_id(self, data): def column_id(self, data):
return str(data[1]) return data[1]
def column_type(self, data): def column_type(self, data):
return str(PlaceType(data[8])) return str(PlaceType(data[8]))
def column_code(self, data): def column_code(self, data):
return str(data[9]) return data[9]
def column_private(self, data): def column_private(self, data):
if data[17]: if data[17]:

10
gramps/gui/views/treemodels/repomodel.py
View File

@ -117,13 +117,13 @@ class RepositoryModel(FlatBaseModel):
return len(self.fmap)+1 return len(self.fmap)+1
def column_id(self,data): def column_id(self,data):
return str(data[1]) return data[1]
def column_type(self,data): def column_type(self,data):
return str(RepositoryType(data[2])) return str(RepositoryType(data[2]))
def column_name(self,data): def column_name(self,data):
return str(data[3]) return data[3]
def column_city(self,data): def column_city(self,data):
try: try:
@ -201,7 +201,7 @@ class RepositoryModel(FlatBaseModel):
url = Url() url = Url()
url.unserialize(i) url.unserialize(i)
if url.get_type() == UrlType.EMAIL: if url.get_type() == UrlType.EMAIL:
return str(url.path) return url.path
return '' return ''
def column_search_url(self,data): def column_search_url(self,data):
@ -210,7 +210,7 @@ class RepositoryModel(FlatBaseModel):
url = Url() url = Url()
url.unserialize(i) url.unserialize(i)
if url.get_type() == UrlType.WEB_SEARCH: if url.get_type() == UrlType.WEB_SEARCH:
return str(url.path) return url.path
return '' return ''
def column_home_url(self,data): def column_home_url(self,data):
@ -219,7 +219,7 @@ class RepositoryModel(FlatBaseModel):
url = Url() url = Url()
url.unserialize(i) url.unserialize(i)
if url.get_type() == UrlType.WEB_HOME: if url.get_type() == UrlType.WEB_HOME:
return str(url.path) return url.path
return "" return ""
def column_private(self, data): def column_private(self, data):

10
gramps/gui/views/treemodels/sourcemodel.py
View File

@ -99,19 +99,19 @@ class SourceModel(FlatBaseModel):
return len(self.fmap)+1 return len(self.fmap)+1
def column_title(self,data): def column_title(self,data):
return str(data[2]) return data[2]
def column_author(self,data): def column_author(self,data):
return str(data[3]) return data[3]
def column_abbrev(self,data): def column_abbrev(self,data):
return str(data[7]) return data[7]
def column_id(self,data): def column_id(self,data):
return str(data[1]) return data[1]
def column_pubinfo(self,data): def column_pubinfo(self,data):
return str(data[4]) return data[4]
def column_private(self, data): def column_private(self, data):
if data[12]: if data[12]: