[Checkins] SVN: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/ Rename the "util" module to more sensible "basedir", as it only contains a helper functions to iterate over XDG base directories.
Dan Korostelev
nadako at gmail.com
Tue Sep 8 15:13:19 EDT 2009
Log message for revision 103664:
Rename the "util" module to more sensible "basedir", as it only contains a helper functions to iterate over XDG base directories.
Rename the "match0" function of MagicRule to more sensible "matchFirst".
Changed:
A Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/basedir.py
U Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/magic.py
U Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/mimetype.py
D Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/util.py
U Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/utility.py
-=-
Copied: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/basedir.py (from rev 103650, Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/util.py)
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/basedir.py (rev 0)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/basedir.py 2009-09-08 19:13:19 UTC (rev 103664)
@@ -0,0 +1,34 @@
+##############################################################################
+#
+# Copyright (c) 2009 Zope Foundation and Contributors.
+# All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+"""XDG base directory helpers
+
+$Id$
+"""
+import os
+
+XDG_DATA_HOME = os.environ.get(
+ 'XDG_DATA_HOME', os.path.join(os.environ.get('HOME', '/'), '.local', 'share'))
+XDG_DATA_DIRS = [XDG_DATA_HOME] + \
+ [dir for dir in
+ os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':')
+ if dir]
+
+def iterDataPaths(*resource):
+ """Iterate over all ``data`` paths as defined by XDG basedir standard"""
+
+ resource = os.path.join(*resource)
+ for data_dir in XDG_DATA_DIRS:
+ path = os.path.join(data_dir, resource)
+ if os.path.exists(path):
+ yield path
Modified: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/magic.py
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/magic.py 2009-09-08 19:07:46 UTC (rev 103663)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/magic.py 2009-09-08 19:13:19 UTC (rev 103664)
@@ -185,12 +185,12 @@
def match(self, buffer):
"""Try to match data with this rule and its subrules"""
- if self.match0(buffer):
+ if self.matchFirst(buffer):
if self.next:
return self.next.match(buffer)
return True
- def match0(self, buffer):
+ def matchFirst(self, buffer):
"""Try to match data using this rule definition"""
l = len(buffer)
for o in xrange(self.range):
Modified: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/mimetype.py
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/mimetype.py 2009-09-08 19:07:46 UTC (rev 103663)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/mimetype.py 2009-09-08 19:13:19 UTC (rev 103664)
@@ -22,8 +22,8 @@
from zope.i18n.simpletranslationdomain import SimpleTranslationDomain
from zope.i18nmessageid import MessageFactory
+from z3c.sharedmimeinfo.basedir import iterDataPaths
from z3c.sharedmimeinfo.interfaces import IMIMEType
-from z3c.sharedmimeinfo.util import iterDataPaths
SMI_NAMESPACE = 'http://www.freedesktop.org/standards/shared-mime-info'
Deleted: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/util.py
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/util.py 2009-09-08 19:07:46 UTC (rev 103663)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/util.py 2009-09-08 19:13:19 UTC (rev 103664)
@@ -1,31 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2009 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Utility functions
-
-$Id$
-"""
-import os
-
-XDG_DATA_HOME = os.environ.get('XDG_DATA_HOME', os.path.join(os.environ.get('HOME', '/'), '.local', 'share'))
-XDG_DATA_DIRS = [XDG_DATA_HOME] + [dir for dir in os.environ.get('XDG_DATA_DIRS', '/usr/local/share:/usr/share').split(':') if dir]
-
-
-def iterDataPaths(*resource):
- """Iterate over all ``data`` paths as defined by XDG standard"""
-
- resource = os.path.join(*resource)
- for data_dir in XDG_DATA_DIRS:
- path = os.path.join(data_dir, resource)
- if os.path.exists(path):
- yield path
Modified: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/utility.py
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/utility.py 2009-09-08 19:07:46 UTC (rev 103663)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/utility.py 2009-09-08 19:13:19 UTC (rev 103664)
@@ -22,10 +22,10 @@
from zope.interface import implements
+from z3c.sharedmimeinfo.basedir import iterDataPaths
+from z3c.sharedmimeinfo.interfaces import IMIMETypesUtility
from z3c.sharedmimeinfo.magic import MagicDB
from z3c.sharedmimeinfo.mimetype import MIMEType
-from z3c.sharedmimeinfo.util import iterDataPaths
-from z3c.sharedmimeinfo.interfaces import IMIMETypesUtility
findBinary = re.compile('[\0-\7]').search
More information about the checkins
mailing list