From c7c8d4b0f089796392e691167cfea3dbfba45a84 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Tue, 2 Oct 2012 11:45:19 +0000 Subject: [PATCH] Code guidelines: absolute import outside of submodule svn: r20482 --- gramps/gen/filters/rules/_changedsincebase.py | 2 +- gramps/gen/merge/diff.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gramps/gen/filters/rules/_changedsincebase.py b/gramps/gen/filters/rules/_changedsincebase.py index e9a4638a0..031d99a00 100644 --- a/gramps/gen/filters/rules/_changedsincebase.py +++ b/gramps/gen/filters/rules/_changedsincebase.py @@ -77,7 +77,7 @@ class ChangedSinceBase(Rule): time_tup = time.strptime(iso_date_time, "%Y-%m-%d %H:%M:%S") time_sec = time.mktime(time_tup) except ValueError: - from gui.dialog import WarningDialog + from gramps.gui.dialog import WarningDialog WarningDialog(_("Wrong format of date-time"), _("Only date-times in the iso format of yyyy-mm-dd " "hh:mm:ss, where the time part is optional, are " diff --git a/gramps/gen/merge/diff.py b/gramps/gen/merge/diff.py index ab7076bd7..1aac66178 100644 --- a/gramps/gen/merge/diff.py +++ b/gramps/gen/merge/diff.py @@ -25,7 +25,7 @@ This package implements an object difference engine. """ import os -import gramps.cli.user +from gramps.cli.user import User from ..dbstate import DbState from gramps.cli.grampscli import CLIManager from ..plug import BasePluginManager @@ -35,7 +35,7 @@ def import_as_dict(filename): """ Import the filename into a DictionaryDb and return it. """ - user = cli.user.User() + user = User() db = DictionaryDb() dbstate = DbState() climanager = CLIManager(dbstate, False) # do not load db_loader