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

fix vcf filter and tweak test_imports for better pythonic

Browse Source
This commit is contained in:
prculley 2016-06-27 16:44:45 -05:00
parent a8fe152a43
commit 3bcfdcff60
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gramps/plugins/test/test_exports.py
View File

@ -148,7 +148,16 @@ def vcffilt(line):
The differences are not functional, but are related to changes in Gramps The differences are not functional, but are related to changes in Gramps
version. version.
""" """
return False if line.startswith('PRODID:') else True diftyp = line[0]
if diftyp == '@':
retval = False
elif diftyp == ' ':
retval = False
elif 'PRODID:' in line: # Gramps version is on these lines
retval = False
else:
retval = True
return retval
class ExportControl(unittest.TestCase): class ExportControl(unittest.TestCase):

2
gramps/plugins/test/test_imports.py
View File

@ -243,7 +243,7 @@ else:
_tstfiles = [] _tstfiles = []
for _tstfile in os.listdir(TEST_DIR): for _tstfile in os.listdir(TEST_DIR):
(fname, ext) = os.path.splitext(os.path.basename(_tstfile)) (fname, ext) = os.path.splitext(os.path.basename(_tstfile))
if ext == ".gramps" or ext == ".difs" or ext == ".bak" \ if ext in (".gramps", ".difs", ".bak") \
or not fname.startswith("imp_"): or not fname.startswith("imp_"):
continue continue
test_func = make_tst_function(_tstfile, fname) test_func = make_tst_function(_tstfile, fname)