From 00d233a3c5f2b909e546b4619d50f1e200d44ade Mon Sep 17 00:00:00 2001 From: Vassilii Khachaturov Date: Thu, 29 Aug 2013 18:59:43 +0000 Subject: [PATCH] Add missing imports, obsolete __main__ checks svn: r22943 --- src/Merge/test/merge_ref_test.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Merge/test/merge_ref_test.py b/src/Merge/test/merge_ref_test.py index c140c2e62..9b70136c6 100644 --- a/src/Merge/test/merge_ref_test.py +++ b/src/Merge/test/merge_ref_test.py @@ -24,6 +24,7 @@ Unittest that tests that part of the merge process that influences other objects than the objects merging. """ +from __future__ import print_function, unicode_literals import unittest import time @@ -38,6 +39,7 @@ import libxslt from libgrampsxml import GRAMPS_XML_VERSION from const import ROOT_DIR, VERSION, USER_PLUGINS import gen.lib +from gen.lib import Name, Surname from gen.ggettext import sgettext as _ class CopiedDoc(object): @@ -2221,10 +2223,4 @@ class FamilyMergeCheck(BaseMergeCheck): 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()