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

[Thomas Lotze]

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

Changed:
  U   zope.file/trunk/CHANGES.txt
  U   zope.file/trunk/setup.py
  U   zope.file/trunk/src/zope/file/upload.py

-=-
Modified: zope.file/trunk/CHANGES.txt
===================================================================
--- zope.file/trunk/CHANGES.txt	2009-10-19 15:12:54 UTC (rev 105150)
+++ zope.file/trunk/CHANGES.txt	2009-10-19 15:13:56 UTC (rev 105151)
@@ -5,7 +5,8 @@
 0.6.0 (unreleased)
 ------------------
 
-- ...
+- Import content-type parser from zope.contenttype, adding a dependency on
+  that package.
 
 0.5.0 (2009-07-23)
 ------------------

Modified: zope.file/trunk/setup.py
===================================================================
--- zope.file/trunk/setup.py	2009-10-19 15:12:54 UTC (rev 105150)
+++ zope.file/trunk/setup.py	2009-10-19 15:13:56 UTC (rev 105151)
@@ -73,6 +73,7 @@
      install_requires=['setuptools',
                        'ZODB3',
                        'zope.container',
+                       'zope.contenttype>=3.5.0dev',
                        'zope.event',
                        'zope.interface',
                        'zope.publisher',

Modified: zope.file/trunk/src/zope/file/upload.py
===================================================================
--- zope.file/trunk/src/zope/file/upload.py	2009-10-19 15:12:54 UTC (rev 105150)
+++ zope.file/trunk/src/zope/file/upload.py	2009-10-19 15:13:56 UTC (rev 105151)
@@ -17,6 +17,7 @@
 
 import re
 import zope.container.interfaces
+import zope.contenttype.parse
 import zope.lifecycleevent
 import zope.component
 import zope.event
@@ -24,7 +25,6 @@
 import zope.formlib.form
 import zope.mimetype.event
 import zope.mimetype.interfaces
-import zope.publisher.contenttype
 import zope.schema
 import zope.security.proxy
 
@@ -148,7 +148,7 @@
     if not mimeType:
         mimeType = "application/octet-stream"
     if contentType:
-        major, minor, parameters = zope.publisher.contenttype.parse(
+        major, minor, parameters = zope.contenttype.parse.parse(
             contentType)
         if "charset" in parameters:
             parameters["charset"] = parameters["charset"].lower()