Changes to Export GEDCOM consequent on pylint changes in r18846.

svn: r18858
This commit is contained in:
Tim G L Lyons 2012-02-11 16:48:06 +00:00
parent 1aa761efbb
commit 81f46dcc90

View File

@ -570,7 +570,7 @@ class GedcomWriter(UpdateCallback):
if role != gen.lib.EventRoleType.PRIMARY: if role != gen.lib.EventRoleType.PRIMARY:
continue continue
val = libgedcom.personalConstantEvents.get(etype, "").strip() val = libgedcom.PERSONALCONSTANTEVENTS.get(etype, "").strip()
if val and val.strip(): if val and val.strip():
if val in NEEDS_PARAMETER: if val in NEEDS_PARAMETER:
@ -650,7 +650,7 @@ class GedcomWriter(UpdateCallback):
for attr in attr_list: for attr in attr_list:
attr_type = int(attr.get_type()) attr_type = int(attr.get_type())
name = libgedcom.personalConstantAttributes.get(attr_type) name = libgedcom.PERSONALCONSTANTATTRIBUTES.get(attr_type)
key = str(attr.get_type()) key = str(attr.get_type())
value = attr.get_value().strip().replace('\r', ' ') value = attr.get_value().strip().replace('\r', ' ')
@ -852,7 +852,7 @@ class GedcomWriter(UpdateCallback):
event = self.dbase.get_event_from_handle(event_ref.ref) event = self.dbase.get_event_from_handle(event_ref.ref)
if event is None: continue if event is None: continue
etype = int(event.get_type()) etype = int(event.get_type())
val = libgedcom.familyConstantEvents.get(etype) val = libgedcom.FAMILYCONSTANTEVENTS.get(etype)
if val: if val:
if event_has_subordinate_data(event, event_ref): if event_has_subordinate_data(event, event_ref):
@ -907,7 +907,7 @@ class GedcomWriter(UpdateCallback):
for attr in attr_list: for attr in attr_list:
attr_type = int(attr.get_type()) attr_type = int(attr.get_type())
name = libgedcom.familyConstantAttributes.get(attr_type) name = libgedcom.FAMILYCONSTANTATTRIBUTES.get(attr_type)
value = attr.get_value().replace('\r', ' ') value = attr.get_value().replace('\r', ' ')
if attr_type in ("AFN", "RFN", "REFN", "_UID"): if attr_type in ("AFN", "RFN", "REFN", "_UID"):