From 7688269a45691e889baa617516167d9d1f762159 Mon Sep 17 00:00:00 2001 From: Thomas Leonard Date: Fri, 16 May 2003 14:14:43 +0000 Subject: [PATCH] Support basedir spec. git-svn-id: https://rox.svn.sourceforge.net/svnroot/rox/trunk/MIME-Editor@2700 66de3db3-b00d-0410-b41b-f4738ad19bea --- override.py | 2 +- type.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/override.py b/override.py index 9628840..60cc7a2 100644 --- a/override.py +++ b/override.py @@ -4,7 +4,7 @@ from xml.dom import Node, XMLNS_NAMESPACE FREE_NS='http://www.freedesktop.org/standards/shared-mime-info' -home_mime = os.path.join(os.environ['HOME'], '.mime') +home_mime = os.path.join(rox.basedir.xdg_data_home, 'mime') user_override = os.path.join(home_mime, 'packages', 'Override.xml') def get_override(): diff --git a/type.py b/type.py index 72ec0ca..ef49199 100644 --- a/type.py +++ b/type.py @@ -1,6 +1,6 @@ import os import rox -from rox import g +from rox import g, basedir from xml.parsers import expat from xml.dom import XML_NAMESPACE, Node import fields @@ -9,7 +9,7 @@ from override import FREE_NS types = {} -home_mime = os.path.join(os.environ['HOME'], '.mime') +home_mime = os.path.join(basedir.xdg_data_home, '.mime') def data(node): return ''.join([text.nodeValue for text in node.childNodes @@ -274,7 +274,7 @@ def init(): global types, system_types if system_types is None: types = {} - for mime_dir in ['/usr/share/mime', '/usr/local/share/mime', home_mime]: + for mime_dir in basedir.load_data_paths('mime'): packages_dir = os.path.join(mime_dir, 'packages') if not os.path.isdir(packages_dir): continue -- 2.11.4.GIT