From 47dab1e0fe7f02079fc77ef5d3ead40f71769ac5 Mon Sep 17 00:00:00 2001
From: Enno Borgsteede <ennoborg@gmail.com>
Date: Sun, 12 Apr 2015 10:44:10 -0700
Subject: [PATCH] 8483: db upgrade fails, fatal damage

---
 gramps/gen/const.py                     | 2 +-
 gramps/gen/merge/test/merge_ref_test.py | 2 +-
 gramps/gen/plug/_pluginreg.py           | 2 +-
 gramps/gen/plug/utils.py                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gramps/gen/const.py b/gramps/gen/const.py
index 4ff788243..3b5c39ff2 100644
--- a/gramps/gen/const.py
+++ b/gramps/gen/const.py
@@ -47,7 +47,7 @@ from .constfunc import get_env_var, conv_to_unicode
 #
 #-------------------------------------------------------------------------
 PROGRAM_NAME   = "Gramps"
-from ..version import VERSION, VERSION_TUPLE, major_version
+from gramps.version import VERSION, VERSION_TUPLE, major_version
 #-------------------------------------------------------------------------
 #
 # Standard GRAMPS Websites
diff --git a/gramps/gen/merge/test/merge_ref_test.py b/gramps/gen/merge/test/merge_ref_test.py
index 416e975f4..717d6f350 100644
--- a/gramps/gen/merge/test/merge_ref_test.py
+++ b/gramps/gen/merge/test/merge_ref_test.py
@@ -31,7 +31,7 @@ import libxslt
 
 from gramps.plugins.lib.libgrampsxml import GRAMPS_XML_VERSION
 from ...const import ROOT_DIR, USER_PLUGINS
-from ....version import VERSION
+from gramps.version import VERSION
 from ...lib import Name, Surname
 from ...const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.sgettext
diff --git a/gramps/gen/plug/_pluginreg.py b/gramps/gen/plug/_pluginreg.py
index 4aa157179..f3b46a226 100644
--- a/gramps/gen/plug/_pluginreg.py
+++ b/gramps/gen/plug/_pluginreg.py
@@ -40,7 +40,7 @@ import io
 # GRAMPS modules
 #
 #-------------------------------------------------------------------------
-from ...version import VERSION as GRAMPSVERSION, VERSION_TUPLE
+from gramps.version import VERSION as GRAMPSVERSION, VERSION_TUPLE
 from ..const import IMAGE_DIR
 from ..const import GRAMPS_LOCALE as glocale
 _ = glocale.translation.gettext
diff --git a/gramps/gen/plug/utils.py b/gramps/gen/plug/utils.py
index 9caadfada..6b8c52cb0 100644
--- a/gramps/gen/plug/utils.py
+++ b/gramps/gen/plug/utils.py
@@ -47,7 +47,7 @@ LOG = logging.getLogger(".gen.plug")
 #-------------------------------------------------------------------------
 from ._pluginreg import make_environment
 from ..const import USER_PLUGINS
-from ...version import VERSION_TUPLE
+from gramps.version import VERSION_TUPLE
 from . import BasePluginManager
 from ..utils.configmanager import safe_eval
 from ..config import config