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

4
gramps/gen/lib/address.py
View File

@ -93,7 +93,7 @@ class Address(SecondaryObject, PrivacyBase, CitationBase, NoteBase, DateBase,
"note_list": NoteBase.to_struct(self),
"date": DateBase.to_struct(self),
"location": LocationBase.to_struct(self)
}
}
@classmethod
def from_struct(cls, struct):
@ -108,7 +108,7 @@ class Address(SecondaryObject, PrivacyBase, CitationBase, NoteBase, DateBase,
NoteBase.from_struct(struct.get("note_list", default.note_list)),
DateBase.from_struct(struct.get("date", {})),
LocationBase.from_struct(struct.get("location", {}))
)
)
def unserialize(self, data):
"""

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

@ -55,7 +55,7 @@ class AttributeRootBase(object):
"""
if source:
self.attribute_list = [self._CLASS(attribute)
for attribute in source.attribute_list]
for attribute in source.attribute_list]
else:
self.attribute_list = []

5
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
@ -138,7 +139,7 @@ class CitationBase(object):
:type handle: list
"""
LOG.debug('enter remove_citation handle: %s self: %s citation_list: %s'
% (citation_handle_list, self, self.citation_list))
% (citation_handle_list, self, self.citation_list))
for handle in citation_handle_list:
if handle in self.citation_list:
LOG.debug('remove handle %s from citation_list %s' %

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

@ -46,7 +46,7 @@ from .handle import Handle
#
#-------------------------------------------------------------------------
class EventRef(PrivacyBase, NoteBase, AttributeBase, RefBase,
IndirectCitationBase, SecondaryObject):
IndirectCitationBase, SecondaryObject):
"""
Event reference class.
@ -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()

38
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,42 +56,35 @@ 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):
def name_stats(self, name):
if name in self.stats:
return self.stats[name]
return (0, 0, 0)
def count_name (self, name, gender):
def count_name(self, name, gender):
"""
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
self._set_stats(keyname, gender)
def count_person (self, person, undo = 0):
def count_person(self, person, undo=0):
if not person:
return
# Let the Person do their own counting later
keyname = self._get_key (person)
keyname = _get_key(person)
if not keyname:
return
gender = person.get_gender()
self._set_stats(keyname, gender, undo)
def _set_stats (self, keyname, gender, undo=0):
(male, female, unknown) = self.name_stats (keyname)
def _set_stats(self, keyname, gender, undo=0):
(male, female, unknown) = self.name_stats(keyname)
if not undo:
increment = 1
else:
@ -112,11 +105,11 @@ class GenderStats(object):
self.stats[keyname] = (male, female, unknown)
def uncount_person (self, person):
return self.count_person (person, undo = 1)
def uncount_person(self, person):
return self.count_person(person, undo=1)
def guess_gender (self, name):
name = self._get_key_from_name (name)
def guess_gender(self, 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('?', '')

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

@ -54,7 +54,7 @@ class LdsOrdBase(object):
if source:
self.lds_ord_list = [LdsOrd(lds_ord)
for lds_ord in source.lds_ord_list]
for lds_ord in source.lds_ord_list]
else:
self.lds_ord_list = []

6
gramps/gen/lib/mediabase.py
View File

@ -146,7 +146,7 @@ class MediaBase(object):
else:
self.media_list.append(addendum)
def has_media_reference(self, obj_handle) :
def has_media_reference(self, obj_handle):
"""
Return True if the object or any of it's child objects has reference
to this media object handle.
@ -167,7 +167,7 @@ class MediaBase(object):
:type obj_handle_list: list
"""
new_media_list = [media_ref for media_ref in self.media_list
if media_ref.ref not in obj_handle_list]
if media_ref.ref not in obj_handle_list]
self.media_list = new_media_list
def replace_media_references(self, old_handle, new_handle):
@ -180,7 +180,7 @@ class MediaBase(object):
:param new_handle: The media handle to replace the old one with.
:type new_handle: str
"""
refs_list = [ media_ref.ref for media_ref in self.media_list ]
refs_list = [media_ref.ref for media_ref in self.media_list]
new_ref = None
if new_handle in refs_list:
new_ref = self.media_list[refs_list.index(new_handle)]

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

@ -96,7 +96,7 @@ class MediaRef(SecondaryObject, PrivacyBase, CitationBase, NoteBase, RefBase,
"note_list": NoteBase.to_struct(self),
"attribute_list": AttributeBase.to_struct(self),
"ref": Handle("Media", self.ref),
"rect": self.rect if self.rect != (0,0,0,0) else None}
"rect": self.rect if self.rect != (0, 0, 0, 0) else None}
@classmethod
def from_struct(cls, struct):
@ -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)

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

@ -57,11 +57,11 @@ class Name(SecondaryObject, PrivacyBase, SurnameBase, CitationBase, NoteBase,
object stores one of them
"""
DEF = 0 # Default format (determined by gramps-wide prefs)
LNFN = 1 # last name first name
FNLN = 2 # first name last name
FN = 4 # first name
LNFNP= 5 # primary name primconnector rest, given pa/ma suffix, primprefix
DEF = 0 # Default format (determined by gramps-wide prefs)
LNFN = 1 # last name first name
FNLN = 2 # first name last name
FN = 4 # first name
LNFNP = 5 # primary name primconnector rest, given pa/ma suffix, primprefix
NAMEFORMATS = (DEF, LNFN, FNLN, FN, LNFNP)
#deprecated :
@ -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:

5
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
#-------------------------------------------------------------------------
#
@ -191,8 +190,8 @@ class PlaceName(SecondaryObject, DateBase):
:rtype: int
"""
if (self.value != other.value or
self.date != other.date or
self.lang != other.lang):
self.date != other.date or
self.lang != other.lang):
return DIFFERENT
else:
if self.is_equal(other):

12
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):
@ -159,17 +159,17 @@ class Researcher(LocationBase):
self.name = other_researcher.name
self.addr = other_researcher.addr
self.email = other_researcher.email
self.email = other_researcher.email
def get(self):
return [getattr(self, value) for value in
['name', 'addr', 'locality', 'city', 'state',
'country', 'postal', 'phone', 'email']
]
['name', 'addr', 'locality', 'city', 'state',
'country', 'postal', 'phone', 'email']
]
def is_empty(self):
for attr in ['name', 'addr', 'locality', 'city', 'state',
'country', 'postal', 'phone', 'email']:
'country', 'postal', 'phone', 'email']:
if getattr(self, attr) != "":
return False
return True

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
#-------------------------------------------------------------------------
#

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

@ -182,7 +182,7 @@ class Url(SecondaryObject, PrivacyBase):
def are_equal(self, other):
"""Deprecated - use :meth:`~.SecondaryObject.is_equal` instead."""
warn( "Use is_equal instead of are_equal", DeprecationWarning, 2)
warn("Use is_equal instead of are_equal", DeprecationWarning, 2)
return self.is_equal(other)
def parse_path(self):