[Checkins] SVN: Sandbox/nadako/z3c.sharedmimeinfo/trunk/ Checkpoint. Rename the package.
Dan Korostelev
nadako at gmail.com
Tue Sep 8 12:41:01 EDT 2009
Log message for revision 103650:
Checkpoint. Rename the package.
Changed:
U Sandbox/nadako/z3c.sharedmimeinfo/trunk/buildout.cfg
U Sandbox/nadako/z3c.sharedmimeinfo/trunk/setup.py
D Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/mimetype/
A Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/
U Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/README.txt
U Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/__init__.py
D Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/index.txt
U Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/magic.py
U Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/mimetype.py
U Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/tests/test_doc.py
U Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/utility.py
-=-
Modified: Sandbox/nadako/z3c.sharedmimeinfo/trunk/buildout.cfg
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/buildout.cfg 2009-09-08 16:29:35 UTC (rev 103649)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/buildout.cfg 2009-09-08 16:41:00 UTC (rev 103650)
@@ -1,21 +1,14 @@
[buildout]
develop = .
-parts = test coverage-test coverage-report docs
+parts = test coverage-test coverage-report pydev
[test]
recipe = zc.recipe.testrunner
-eggs = z3c.mimetype [test]
+eggs = z3c.sharedmimeinfo [test]
-[docs]
-recipe = z3c.recipe.sphinxdoc
-eggs = z3c.mimetype [docs]
-build-dir = ${buildout:directory}/docs
-default.css =
-layout.html =
-
[coverage-test]
recipe = zc.recipe.testrunner
-eggs = z3c.mimetype [test]
+eggs = z3c.sharedmimeinfo [test]
defaults = ['--coverage', '../../coverage']
[coverage-report]
@@ -23,3 +16,7 @@
eggs = z3c.coverage
scripts = coverage=coverage-report
arguments = ('coverage', 'coverage/report')
+
+[pydev]
+recipe = pb.recipes.pydev
+eggs = z3c.sharedmimeinfo [test]
Modified: Sandbox/nadako/z3c.sharedmimeinfo/trunk/setup.py
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/setup.py 2009-09-08 16:29:35 UTC (rev 103649)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/setup.py 2009-09-08 16:41:00 UTC (rev 103650)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Setup for z3c.mimetype package
+"""Setup for z3c.sharedmimeinfo package
$Id$
"""
@@ -23,15 +23,15 @@
return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
setup(
- name='z3c.mimetype',
+ name='z3c.sharedmimeinfo',
version='0.1.0dev',
- url='http://pypi.python.org/pypi/z3c.mimetype',
+ url='http://pypi.python.org/pypi/z3c.sharedmimeinfo',
license='ZPL 2.1',
description='MIME type guessing framework for Zope, based on shared-mime-info',
author='Dan Korostelev and Zope Community',
author_email='zope-dev at zope.org',
long_description=\
- read('src', 'z3c', 'mimetype', 'README.txt') + \
+ read('src', 'z3c', 'sharedmimeinfo', 'README.txt') + \
'\n\n' + \
read('CHANGES.txt'),
packages=find_packages('src'),
@@ -46,7 +46,6 @@
'zope.schema',
],
extras_require = dict(
- docs=['Sphinx', 'z3c.recipe.sphinxdoc'],
test=['zope.testing'],
),
include_package_data=True,
Modified: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/README.txt
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/mimetype/README.txt 2009-09-08 16:29:35 UTC (rev 103649)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/README.txt 2009-09-08 16:41:00 UTC (rev 103650)
@@ -28,7 +28,7 @@
>>> from zope.component import getUtility
>>> from zope.interface.verify import verifyObject
- >>> from z3c.mimetype.interfaces import IMIMETypesUtility
+ >>> from z3c.sharedmimeinfo.interfaces import IMIMETypesUtility
>>> util = getUtility(IMIMETypesUtility)
>>> verifyObject(IMIMETypesUtility, util)
@@ -50,7 +50,7 @@
The mime type is the object implementing IMIMEType interface::
>>> from zope.interface.verify import verifyObject
- >>> from z3c.mimetype.interfaces import IMIMEType
+ >>> from z3c.sharedmimeinfo.interfaces import IMIMEType
>>> verifyObject(IMIMEType, mt)
True
@@ -195,12 +195,12 @@
Convenience API
---------------
-The root module, ``z3c.mimetype`` provides a convenience API for easy using
+The root module, ``z3c.sharedmimeinfo`` provides a convenience API for easy using
MIME types detection and lookup. It provides a IConvenienceAPI interface::
- >>> import z3c.mimetype
- >>> from z3c.mimetype.interfaces import IConvenienceAPI
- >>> IConvenienceAPI.providedBy(z3c.mimetype)
+ >>> import z3c.sharedmimeinfo
+ >>> from z3c.sharedmimeinfo.interfaces import IConvenienceAPI
+ >>> IConvenienceAPI.providedBy(z3c.sharedmimeinfo)
True
This interface defines two functions::
@@ -214,7 +214,7 @@
Here's how to use it with single argument::
- >>> mt = z3c.mimetype.lookup('text/plain')
+ >>> mt = z3c.sharedmimeinfo.lookup('text/plain')
>>> mt
<_MIMEType text/plain>
@@ -223,29 +223,29 @@
Here's how to use passing separate media and subtype arguments::
- >>> z3c.mimetype.lookup('image', 'png')
+ >>> z3c.sharedmimeinfo.lookup('image', 'png')
<_MIMEType image/png>
Note, that the IMIMETypes objects are singletons (one object per mime type), so
if you youse lookup function with same mime type once again, you'll get the same
object::
- >>> z3c.mimetype.lookup('text/plain') is mt
+ >>> z3c.sharedmimeinfo.lookup('text/plain') is mt
True
The ``getType`` function is just a wrapper for the ``getType`` function of
global mimetype utility, so it works like described above::
- >>> z3c.mimetype.getType()
+ >>> z3c.sharedmimeinfo.getType()
Traceback (most recent call last):
...
TypeError: Either filename or file should be provided or both of them
- >>> print z3c.mimetype.getType(filename='wrong.doc')
+ >>> print z3c.sharedmimeinfo.getType(filename='wrong.doc')
application/msword
>>> fpng = openSample('png')
- >>> print z3c.mimetype.getType(file=fpng)
+ >>> print z3c.sharedmimeinfo.getType(file=fpng)
image/png
>>> funknownbinary = openSample('binary')
@@ -261,7 +261,7 @@
some file is of specific type, the IMIMEType objects should be comparable to
strings::
- >>> mt = z3c.mimetype.lookup('image/png')
+ >>> mt = z3c.sharedmimeinfo.lookup('image/png')
>>> mt == 'image/png'
True
>>> mt == u'image/png'
@@ -273,14 +273,14 @@
Of course, it can also be compared to other IMIMEType objects::
- >>> mt2 = z3c.mimetype.lookup('image/jpeg')
+ >>> mt2 = z3c.sharedmimeinfo.lookup('image/jpeg')
>>> mt == mt2
False
Let's use some internal API to create a second instance of image/png IMIMEType
object and try to compare it with the first one::
- >>> from z3c.mimetype.mimetype import _MIMEType, MIME_TYPES
+ >>> from z3c.sharedmimeinfo.mimetype import _MIMEType, MIME_TYPES
>>> del MIME_TYPES[('image', 'png')]
>>> mt3 = _MIMEType('image', 'png')
>>> mt is not mt3
Modified: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/__init__.py
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/mimetype/__init__.py 2009-09-08 16:29:35 UTC (rev 103649)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/__init__.py 2009-09-08 16:41:00 UTC (rev 103650)
@@ -15,11 +15,11 @@
$Id$
"""
from zope.interface import moduleProvides
-from z3c.mimetype.interfaces import IConvenienceAPI
-from z3c.mimetype.utility import globalMIMETypesUtility
+from z3c.sharedmimeinfo.interfaces import IConvenienceAPI
+from z3c.sharedmimeinfo.utility import globalMIMETypesUtility
-from z3c.mimetype.mimetype import lookup
+from z3c.sharedmimeinfo.mimetype import lookup
def getType(filename=None, file=None):
return globalMIMETypesUtility.getType(filename, file)
Deleted: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/index.txt
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/mimetype/index.txt 2009-09-08 16:29:35 UTC (rev 103649)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/index.txt 2009-09-08 16:41:00 UTC (rev 103650)
@@ -1,16 +0,0 @@
-Welcome to z3c.mimetype's documentation!
-========================================
-
-Contents:
-
-.. toctree::
- :maxdepth: 2
-
- README
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
Modified: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/magic.py
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/mimetype/magic.py 2009-09-08 16:29:35 UTC (rev 103649)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/magic.py 2009-09-08 16:41:00 UTC (rev 103650)
@@ -15,7 +15,7 @@
$Id$
"""
-from z3c.mimetype.mimetype import lookup
+from z3c.sharedmimeinfo.mimetype import lookup
class MagicDB(object):
Modified: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/mimetype.py
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/mimetype/mimetype.py 2009-09-08 16:29:35 UTC (rev 103649)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/mimetype.py 2009-09-08 16:41:00 UTC (rev 103650)
@@ -22,8 +22,8 @@
from zope.i18n.simpletranslationdomain import SimpleTranslationDomain
from zope.i18nmessageid import MessageFactory
-from z3c.mimetype.interfaces import IMIMEType
-from z3c.mimetype.util import iterDataPaths
+from z3c.sharedmimeinfo.interfaces import IMIMEType
+from z3c.sharedmimeinfo.util import iterDataPaths
SMI_NAMESPACE = 'http://www.freedesktop.org/standards/shared-mime-info'
Modified: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/tests/test_doc.py
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/mimetype/tests/test_doc.py 2009-09-08 16:29:35 UTC (rev 103649)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/tests/test_doc.py 2009-09-08 16:41:00 UTC (rev 103650)
@@ -11,7 +11,7 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""Tests for z3c.mimetype functionality.
+"""Tests for z3c.sharedmimeinfo functionality.
$Id$
"""
@@ -21,8 +21,8 @@
from zope.testing import doctest
from zope.component import provideUtility
-from z3c.mimetype.utility import globalMIMETypesUtility
-from z3c.mimetype.mimetype import mimeTypesTranslationDomain
+from z3c.sharedmimeinfo.utility import globalMIMETypesUtility
+from z3c.sharedmimeinfo.mimetype import mimeTypesTranslationDomain
def setUp(test):
Modified: Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/utility.py
===================================================================
--- Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/mimetype/utility.py 2009-09-08 16:29:35 UTC (rev 103649)
+++ Sandbox/nadako/z3c.sharedmimeinfo/trunk/src/z3c/sharedmimeinfo/utility.py 2009-09-08 16:41:00 UTC (rev 103650)
@@ -22,10 +22,10 @@
from zope.interface import implements
-from z3c.mimetype.magic import MagicDB
-from z3c.mimetype.mimetype import lookup
-from z3c.mimetype.util import iterDataPaths
-from z3c.mimetype.interfaces import IMIMETypesUtility
+from z3c.sharedmimeinfo.magic import MagicDB
+from z3c.sharedmimeinfo.mimetype import lookup
+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