[Checkins] SVN: zope.mimetype/trunk/ Import content-type parser from zope.contenttype, adding a dependency on

[Thomas Lotze]

Log message for revision 105152:
  Import content-type parser from zope.contenttype, adding a dependency on
  that package.
  

Changed:
  U   zope.mimetype/trunk/CHANGES.txt
  U   zope.mimetype/trunk/setup.py
  U   zope.mimetype/trunk/src/zope/mimetype/contentinfo.py
  U   zope.mimetype/trunk/src/zope/mimetype/typegetter.py

-=-
Modified: zope.mimetype/trunk/CHANGES.txt
===================================================================
--- zope.mimetype/trunk/CHANGES.txt	2009-10-19 15:13:56 UTC (rev 105151)
+++ zope.mimetype/trunk/CHANGES.txt	2009-10-19 15:31:59 UTC (rev 105152)
@@ -2,11 +2,13 @@
 CHANGES
 =======
 
-1.1.3 (unreleased)
+1.2.0 (unreleased)
 ------------------
 
 - Declared missing dependencies, resolved direct dependency on
   zope.app.publisher.
+- Import content-type parser from zope.contenttype, adding a dependency on
+  that package.
 
 
 1.1.2 (2009-05-22)

Modified: zope.mimetype/trunk/setup.py
===================================================================
--- zope.mimetype/trunk/setup.py	2009-10-19 15:13:56 UTC (rev 105151)
+++ zope.mimetype/trunk/setup.py	2009-10-19 15:31:59 UTC (rev 105152)
@@ -26,7 +26,7 @@
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
-version = '1.1.3dev'
+version = '1.2.0dev'
 
 setup(name='zope.mimetype',
       version=version,
@@ -87,6 +87,7 @@
                         'zope.browserresource',
                         'zope.component',
                         'zope.configuration',
+                        'zope.contenttype>=3.5.0dev',
                         'zope.event',
                         'zope.i18n',
                         'zope.i18nmessageid',

Modified: zope.mimetype/trunk/src/zope/mimetype/contentinfo.py
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/contentinfo.py	2009-10-19 15:13:56 UTC (rev 105151)
+++ zope.mimetype/trunk/src/zope/mimetype/contentinfo.py	2009-10-19 15:31:59 UTC (rev 105152)
@@ -16,9 +16,9 @@
 __docformat__ = "reStructuredText"
 
 import zope.component
+import zope.contenttype.parse
 import zope.interface
 import zope.mimetype.interfaces
-import zope.publisher.contenttype
 
 
 class ContentInfo(object):
@@ -41,7 +41,7 @@
             if "charset" in self.effectiveParameters and not encoded:
                 del self.effectiveParameters["charset"]
             major, minor = self.effectiveMimeType.split("/")
-            self.contentType = zope.publisher.contenttype.join(
+            self.contentType = zope.contenttype.parse.join(
                 (major, minor, self.effectiveParameters))
         else:
             self.contentType = self.effectiveMimeType

Modified: zope.mimetype/trunk/src/zope/mimetype/typegetter.py
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/typegetter.py	2009-10-19 15:13:56 UTC (rev 105151)
+++ zope.mimetype/trunk/src/zope/mimetype/typegetter.py	2009-10-19 15:31:59 UTC (rev 105152)
@@ -20,7 +20,7 @@
 
 from zope import interface
 from zope.mimetype import interfaces
-from zope.publisher import contenttype
+import zope.contenttype.parse
 
 
 def mimeTypeGetter(name=None, data=None, content_type=None):
@@ -28,7 +28,8 @@
         return None
     if content_type:
         try:
-            major, minor, params = contenttype.parseOrdered(content_type)
+            major, minor, params = zope.contenttype.parse.parseOrdered(
+                content_type)
         except ValueError:
             pass
         else:
@@ -110,7 +111,7 @@
         return None
     if content_type:
         try:
-            major, minor, params = contenttype.parse(content_type)
+            major, minor, params = zope.contenttype.parse.parse(content_type)
         except ValueError:
             pass
         else: