From b1da20254a12ac943fe199770e282059f70c1b7f Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sun, 6 Jan 2013 21:43:28 +0000 Subject: [PATCH] Bugs 5972 and 6132: needed to remove python-gnome2 to run, GUI Crash (metaclass conflict) when some package (e.g. python-gnome2) installed, 6132: metaclass conflict in flatbasemodel.py svn: r21015 --- gramps/gen/mime/__init__.py | 7 +--- gramps/gen/mime/_gnomemime.py | 71 ----------------------------------- 2 files changed, 2 insertions(+), 76 deletions(-) delete mode 100644 gramps/gen/mime/_gnomemime.py diff --git a/gramps/gen/mime/__init__.py b/gramps/gen/mime/__init__.py index a91368b7c..94aab1a0f 100644 --- a/gramps/gen/mime/__init__.py +++ b/gramps/gen/mime/__init__.py @@ -22,12 +22,9 @@ # try: - from ._gnomemime import get_description, get_type, mime_type_is_defined + from ._winmime import get_description, get_type, mime_type_is_defined except: - try: - from ._winmime import get_description, get_type, mime_type_is_defined - except: - from ._pythonmime import get_description, get_type, mime_type_is_defined + from ._pythonmime import get_description, get_type, mime_type_is_defined def base_type(val): return val.split('/')[0] diff --git a/gramps/gen/mime/_gnomemime.py b/gramps/gen/mime/_gnomemime.py deleted file mode 100644 index 3e3040d5e..000000000 --- a/gramps/gen/mime/_gnomemime.py +++ /dev/null @@ -1,71 +0,0 @@ -# -# Gramps - a GTK+/GNOME based genealogy program -# -# Copyright (C) 2000-2006 Donald N. Allingham -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# - -# $Id$ - -from gi.repository import Gtk - -try: - from gnomevfs import mime_get_short_list_applications, \ - mime_get_description, get_mime_type, mime_get_default_application -except: - from gnome.vfs import mime_get_short_list_applications, \ - mime_get_description, get_mime_type, mime_get_default_application - -from ..ggettext import gettext as _ - -def get_description(type): - """Return the description of the specified mime type.""" - try: - return mime_get_description(type) - except: - return _("unknown") - -def get_type(file): - """Return the mime type of the specified file.""" - try: - return get_mime_type(file) - except: - return _('unknown') - -def mime_type_is_defined(type): - """ - Return True if a description for a mime type exists. - """ - try: - mime_get_description(type) - return True - except: - return False - - #------------------------------------------------------------------------- -# -# private functions -# -#------------------------------------------------------------------------- -def _is_good_command(cmd): - """ - We don't know what to do with certain substitution values. - If we find one, skip the command. - """ - for sub in [ "%m", "%i", "%c" ]: - if cmd.find(sub) != -1: - return False - return True