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

More pylint improvements

Browse Source
This commit is contained in:
Nick Hall 2016-01-07 19:51:14 +00:00
parent 72d0d46535
commit e85af204dd
14 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps/gen/lib/citationbase.py
View File

@ -30,7 +30,6 @@ CitationBase class for Gramps.
#
#-------------------------------------------------------------------------
import logging
LOG = logging.getLogger(".citation")
#-------------------------------------------------------------------------
#
@ -39,6 +38,8 @@ LOG = logging.getLogger(".citation")
#-------------------------------------------------------------------------
from .handle import Handle
LOG = logging.getLogger(".citation")
#-------------------------------------------------------------------------
#
# CitationBase class

2
gramps/gen/lib/eventref.py
View File

@ -63,7 +63,7 @@ class EventRef(PrivacyBase, NoteBase, AttributeBase, RefBase,
AttributeBase.__init__(self, source)
RefBase.__init__(self, source)
if source:
self.__role = EventRoleType(source.__role)
self.__role = EventRoleType(source.role)
else:
self.__role = EventRoleType()

22
gramps/gen/lib/genderstats.py
View File

@ -42,7 +42,7 @@ class GenderStats(object):
This allows the tracking of the liklihood of a person's given name
indicating the gender of the person.
"""
def __init__ (self, stats={}):
def __init__(self, stats=None):
if stats is None:
self.stats = {}
else:
@ -56,13 +56,6 @@ class GenderStats(object):
self.stats = {}
return self.stats
def _get_key (self, person):
name = person.get_primary_name().get_first_name()
return self._get_key_from_name (name)
def _get_key_from_name (self, name):
return name.split (' ')[0].replace ('?', '')
def name_stats(self, name):
if name in self.stats:
return self.stats[name]
@ -72,7 +65,7 @@ class GenderStats(object):
"""
Count a given name under gender in the gender stats.
"""
keyname = self._get_key_from_name(name)
keyname = _get_key_from_name(name)
if not keyname:
return
@ -83,7 +76,7 @@ class GenderStats(object):
return
# Let the Person do their own counting later
keyname = self._get_key (person)
keyname = _get_key(person)
if not keyname:
return
@ -116,7 +109,7 @@ class GenderStats(object):
return self.count_person(person, undo=1)
def guess_gender(self, name):
name = self._get_key_from_name (name)
name = _get_key_from_name(name)
if not name or name not in self.stats:
return Person.UNKNOWN
@ -134,3 +127,10 @@ class GenderStats(object):
return Person.FEMALE
return Person.UNKNOWN
def _get_key(person):
name = person.get_primary_name().get_first_name()
return _get_key_from_name(name)
def _get_key_from_name(name):
return name.split(' ')[0].replace('?', '')

12
gramps/gen/lib/mediaref.py
View File

@ -107,9 +107,12 @@ class MediaRef(SecondaryObject, PrivacyBase, CitationBase, NoteBase, RefBase,
"""
default = MediaRef()
return (PrivacyBase.from_struct(struct.get("private", default.private)),
CitationBase.from_struct(struct.get("citation_list", default.citation_list)),
NoteBase.from_struct(struct.get("note_list", default.note_list)),
AttributeBase.from_struct(struct.get("attribute_list", default.attribute_list)),
CitationBase.from_struct(struct.get("citation_list",
default.citation_list)),
NoteBase.from_struct(struct.get("note_list",
default.note_list)),
AttributeBase.from_struct(struct.get("attribute_list",
default.attribute_list)),
RefBase.from_struct(struct.get("ref", default.ref)),
struct.get("rect", default.rect))
@ -117,7 +120,8 @@ class MediaRef(SecondaryObject, PrivacyBase, CitationBase, NoteBase, RefBase,
"""
Convert a serialized tuple of data to an object.
"""
(privacy, citation_list, note_list,attribute_list,ref,self.rect) = data
(privacy, citation_list, note_list, attribute_list, ref,
self.rect) = data
PrivacyBase.unserialize(self, privacy)
CitationBase.unserialize(self, citation_list)
NoteBase.unserialize(self, note_list)

22
gramps/gen/lib/name.py
View File

@ -175,11 +175,14 @@ class Name(SecondaryObject, PrivacyBase, SurnameBase, CitationBase, NoteBase,
"""
default = Name()
return (PrivacyBase.from_struct(struct.get("private", default.private)),
CitationBase.from_struct(struct.get("citation_list", default.citation_list)),
NoteBase.from_struct(struct.get("note_list", default.note_list)),
CitationBase.from_struct(struct.get("citation_list",
default.citation_list)),
NoteBase.from_struct(struct.get("note_list",
default.note_list)),
DateBase.from_struct(struct.get("date", {})),
struct.get("first_name", default.first_name),
SurnameBase.from_struct(struct.get("surname_list", default.surname_list)),
SurnameBase.from_struct(struct.get("surname_list",
default.surname_list)),
struct.get("suffix", default.suffix),
struct.get("title", default.title),
NameType.from_struct(struct.get("type", {})),
@ -237,10 +240,12 @@ class Name(SecondaryObject, PrivacyBase, SurnameBase, CitationBase, NoteBase,
Indicate if the name is empty.
"""
namefieldsempty = (self.first_name == "" and
self.suffix == "" and self.title == "" and self.nick == ""
and self.famnick == "")
surnamefieldsempty = not (False in
[surn.is_empty() for surn in self.surname_list])
self.suffix == "" and
self.title == "" and
self.nick == "" and
self.famnick == "")
surnamefieldsempty = False not in [surn.is_empty()
for surn in self.surname_list]
return namefieldsempty and surnamefieldsempty
def unserialize(self, data):
@ -536,7 +541,7 @@ class Name(SecondaryObject, PrivacyBase, SurnameBase, CitationBase, NoteBase,
"""
first = self.first_name
surname = self.get_surname()
if (self.suffix == ""):
if self.suffix == "":
return "%s %s" % (first, surname)
else:
# translators: needed for Arabic, ignore otherwise
@ -569,7 +574,6 @@ class Name(SecondaryObject, PrivacyBase, SurnameBase, CitationBase, NoteBase,
firstname = self.first_name.strip()
surname = self.get_surname().replace('/', '?')
suffix = self.suffix
title = self.title
if suffix == "":
return '%s /%s/' % (firstname, surname)
else:

1
gramps/gen/lib/placename.py
View File

@ -31,7 +31,6 @@ Place name class for Gramps
from .secondaryobj import SecondaryObject
from .datebase import DateBase
from .const import IDENTICAL, EQUAL, DIFFERENT
from .handle import Handle
#-------------------------------------------------------------------------
#

2
gramps/gen/lib/researcher.py
View File

@ -110,7 +110,7 @@ class Researcher(LocationBase):
struct.get("postal", default.postal),
struct.get("phone", default.phone),
struct.get("name", default.name),
struct.get("address", default.address),
struct.get("address", default.addr),
struct.get("email", default.email))
def unserialize(self, data):

5
gramps/gen/lib/srcattribute.py
View File

@ -27,13 +27,8 @@ Source Attribute class for GRAMPS.
# Gramps modules
#
#-------------------------------------------------------------------------
from .secondaryobj import SecondaryObject
from .privacybase import PrivacyBase
from .citationbase import CitationBase
from .notebase import NoteBase
from .attribute import AttributeRoot
from .srcattrtype import SrcAttributeType
from .const import IDENTICAL, EQUAL, DIFFERENT
#-------------------------------------------------------------------------
#

5
gramps/gen/lib/surnamebase.py
View File

@ -22,9 +22,6 @@
SurnameBase class for Gramps.
"""
from ..const import GRAMPS_LOCALE as glocale
_ = glocale.translation.gettext
#-------------------------------------------------------------------------
#
# Gramps modules
@ -32,6 +29,8 @@ _ = glocale.translation.gettext
#-------------------------------------------------------------------------
from .surname import Surname
from .const import IDENTICAL, EQUAL
from ..const import GRAMPS_LOCALE as glocale
_ = glocale.translation.gettext
#-------------------------------------------------------------------------
#