From d770c8a236143a37c157bf995aef24e32497ede4 Mon Sep 17 00:00:00 2001 From: Nick Hall Date: Sat, 28 Nov 2015 22:00:51 +0000 Subject: [PATCH] Remove unused constfunc imports --- gramps/gen/utils/file.py | 2 +- gramps/gui/editors/displaytabs/gallerytab.py | 1 - gramps/gui/views/treemodels/flatbasemodel.py | 1 - gramps/plugins/database/bsddb_support/undoredo.py | 2 +- gramps/plugins/importer/importcsv.py | 1 - gramps/plugins/lib/libgedcom.py | 1 - gramps/plugins/view/mediaview.py | 1 - gramps/plugins/webreport/narrativeweb.py | 2 +- 8 files changed, 3 insertions(+), 8 deletions(-) diff --git a/gramps/gen/utils/file.py b/gramps/gen/utils/file.py index ef687cc26..a6b5cc713 100644 --- a/gramps/gen/utils/file.py +++ b/gramps/gen/utils/file.py @@ -41,7 +41,7 @@ LOG = logging.getLogger(".gen.utils.file") # Gramps modules # #------------------------------------------------------------------------- -from ..constfunc import win, mac, conv_to_unicode, get_env_var +from ..constfunc import win, mac, get_env_var from ..const import TEMP_DIR, USER_HOME, ENV, GRAMPS_LOCALE as glocale #------------------------------------------------------------------------- diff --git a/gramps/gui/editors/displaytabs/gallerytab.py b/gramps/gui/editors/displaytabs/gallerytab.py index 38caa9c19..73a46678e 100644 --- a/gramps/gui/editors/displaytabs/gallerytab.py +++ b/gramps/gui/editors/displaytabs/gallerytab.py @@ -49,7 +49,6 @@ from gi.repository import GLib from ...utils import is_right_click, open_file_with_default_application from ...dbguielement import DbGUIElement from ...selectors import SelectorFactory -from gramps.gen.constfunc import win, conv_to_unicode from gramps.gen.lib import MediaObject, MediaRef from gramps.gen.db import DbTxn from gramps.gen.utils.file import (media_path_full, media_path, relative_path, diff --git a/gramps/gui/views/treemodels/flatbasemodel.py b/gramps/gui/views/treemodels/flatbasemodel.py index 1324e2e66..d18bcf31a 100644 --- a/gramps/gui/views/treemodels/flatbasemodel.py +++ b/gramps/gui/views/treemodels/flatbasemodel.py @@ -71,7 +71,6 @@ from gi.repository import Gtk # #------------------------------------------------------------------------- from gramps.gen.filters import SearchFilter, ExactSearchFilter -from gramps.gen.constfunc import conv_to_unicode, handle2internal from gramps.gen.const import GRAMPS_LOCALE as glocale from .basemodel import BaseModel diff --git a/gramps/plugins/database/bsddb_support/undoredo.py b/gramps/plugins/database/bsddb_support/undoredo.py index babcc942d..5edfa2953 100644 --- a/gramps/plugins/database/bsddb_support/undoredo.py +++ b/gramps/plugins/database/bsddb_support/undoredo.py @@ -51,7 +51,7 @@ _ = glocale.translation.gettext # Gramps modules # #------------------------------------------------------------------------- -from gramps.gen.constfunc import conv_to_unicode, handle2internal, win +from gramps.gen.constfunc import handle2internal from gramps.gen.db.dbconst import * from . import BSDDBTxn from gramps.gen.errors import DbError diff --git a/gramps/plugins/importer/importcsv.py b/gramps/plugins/importer/importcsv.py index d99ac7849..bc5baaeff 100644 --- a/gramps/plugins/importer/importcsv.py +++ b/gramps/plugins/importer/importcsv.py @@ -59,7 +59,6 @@ from gramps.gen.utils.string import gender as gender_map from gramps.gen.utils.id import create_id from gramps.gen.utils.location import located_in from gramps.gen.lib.eventroletype import EventRoleType -from gramps.gen.constfunc import conv_to_unicode from gramps.gen.config import config from gramps.gen.display.place import displayer as place_displayer from gramps.gen.utils.libformatting import ImportInfo diff --git a/gramps/plugins/lib/libgedcom.py b/gramps/plugins/lib/libgedcom.py index 3d4ee4aea..6c7719775 100644 --- a/gramps/plugins/lib/libgedcom.py +++ b/gramps/plugins/lib/libgedcom.py @@ -132,7 +132,6 @@ from gramps.gen.db.dbconst import EVENT_KEY from gramps.gui.dialog import WarningDialog from gramps.gen.lib.const import IDENTICAL, DIFFERENT from gramps.gen.lib import (StyledText, StyledTextTag, StyledTextTagType) -from gramps.gen.constfunc import conv_to_unicode, win from gramps.plugins.lib.libplaceimport import PlaceImport from gramps.gen.display.place import displayer as place_displayer diff --git a/gramps/plugins/view/mediaview.py b/gramps/plugins/view/mediaview.py index 0acd7919b..3bb7988ea 100644 --- a/gramps/plugins/view/mediaview.py +++ b/gramps/plugins/view/mediaview.py @@ -51,7 +51,6 @@ from gi.repository import Gtk from gramps.gui.utils import open_file_with_default_application from gramps.gui.views.listview import ListView, TEXT, MARKUP, ICON from gramps.gui.views.treemodels import MediaModel -from gramps.gen.constfunc import win, conv_to_unicode from gramps.gen.config import config from gramps.gen.utils.file import (media_path, relative_path, media_path_full, create_checksum) diff --git a/gramps/plugins/webreport/narrativeweb.py b/gramps/plugins/webreport/narrativeweb.py index b53927d66..31762b08c 100644 --- a/gramps/plugins/webreport/narrativeweb.py +++ b/gramps/plugins/webreport/narrativeweb.py @@ -119,7 +119,7 @@ from gramps.gen.utils.string import conf_strings from gramps.gen.utils.file import media_path_full from gramps.gen.utils.alive import probably_alive from gramps.gen.utils.db import get_source_and_citation_referents -from gramps.gen.constfunc import win, conv_to_unicode, get_curr_dir +from gramps.gen.constfunc import win, get_curr_dir from gramps.gen.config import config from gramps.gen.utils.thumbnails import get_thumbnail_path, run_thumbnailer from gramps.gen.utils.image import image_size, resize_to_jpeg_buffer