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

Add missing imports, obsolete __main__ checks

Browse Source 
svn: r22943
This commit is contained in:
Vassilii Khachaturov 2013-08-29 18:59:43 +00:00
parent 3600d3f3c4
commit 00d233a3c5
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Merge/test/merge_ref_test.py
View File

@ -24,6 +24,7 @@
Unittest that tests that part of the merge process that influences other Unittest that tests that part of the merge process that influences other
objects than the objects merging. objects than the objects merging.
""" """
from __future__ import print_function, unicode_literals
import unittest import unittest
import time import time
@ -38,6 +39,7 @@ import libxslt
from libgrampsxml import GRAMPS_XML_VERSION from libgrampsxml import GRAMPS_XML_VERSION
from const import ROOT_DIR, VERSION, USER_PLUGINS from const import ROOT_DIR, VERSION, USER_PLUGINS
import gen.lib import gen.lib
from gen.lib import Name, Surname
from gen.ggettext import sgettext as _ from gen.ggettext import sgettext as _
class CopiedDoc(object): class CopiedDoc(object):
@ -2221,10 +2223,4 @@ class FamilyMergeCheck(BaseMergeCheck):
if __name__ == "__main__": if __name__ == "__main__":
if not os.path.isdir(os.path.join(USER_PLUGINS, 'CliMerge')):
print('This program needs the third party "CliMerge" plugin.', file=sys.stderr)
sys.exit(1)
if not os.path.isdir(os.path.join(USER_PLUGINS, 'ExportRaw')):
print('This program needs the third party "ExportRaw" plugin.', file=sys.stderr)
sys.exit(1)
unittest.main() unittest.main()