[Checkins] SVN: zope.app.file/trunk/ Import content-type parser from zope.contenttype, reducing zope.publisher to

[Thomas Lotze]

Log message for revision 105148:
  Import content-type parser from zope.contenttype, reducing zope.publisher to
  a test dependency.
  

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

-=-
Modified: zope.app.file/trunk/CHANGES.txt
===================================================================
--- zope.app.file/trunk/CHANGES.txt	2009-10-19 14:53:28 UTC (rev 105147)
+++ zope.app.file/trunk/CHANGES.txt	2009-10-19 14:55:24 UTC (rev 105148)
@@ -7,6 +7,8 @@
 
 - Fix ftesting.zcml due to zope.securitypolicy update.
 - Added missing dependency on transaction.
+- Import content-type parser from zope.contenttype, reducing zope.publisher to
+  a test dependency.
 
 3.5.0 (2009-01-31)
 ------------------

Modified: zope.app.file/trunk/setup.py
===================================================================
--- zope.app.file/trunk/setup.py	2009-10-19 14:53:28 UTC (rev 105147)
+++ zope.app.file/trunk/setup.py	2009-10-19 14:55:24 UTC (rev 105148)
@@ -61,12 +61,14 @@
       namespace_packages=['zope', 'zope.app'],
       extras_require = dict(test=['zope.app.testing',
                                   'zope.app.securitypolicy',
-                                  'zope.app.zcmlfiles',]),
+                                  'zope.app.zcmlfiles',
+                                  'zope.publisher',
+                                  ]),
       install_requires=['setuptools',
                         'transaction',
                         'ZODB3',
                         'zope.app.publication',
-                        'zope.contenttype',
+                        'zope.contenttype>=3.5.0dev',
                         'zope.datetime',
                         'zope.dublincore',
                         'zope.event',
@@ -74,7 +76,6 @@
                         'zope.filerepresentation',
                         'zope.i18nmessageid',
                         'zope.interface',
-                        'zope.publisher',
                         'zope.schema',
                         'zope.site',
                         'zope.size',

Modified: zope.app.file/trunk/src/zope/app/file/browser/file.py
===================================================================
--- zope.app.file/trunk/src/zope/app/file/browser/file.py	2009-10-19 14:53:28 UTC (rev 105147)
+++ zope.app.file/trunk/src/zope/app/file/browser/file.py	2009-10-19 14:55:24 UTC (rev 105148)
@@ -18,7 +18,7 @@
 import zope.event
 from zope import lifecycleevent
 from zope.contenttype import guess_content_type
-from zope.publisher import contenttype
+import zope.contenttype.parse
 from zope.schema import Text
 from zope.exceptions.interfaces import UserError
 
@@ -497,7 +497,7 @@
 
     """
     if content_type and content_type.strip():
-        major, minor, params = contenttype.parse(content_type)
+        major, minor, params = zope.contenttype.parse.parse(content_type)
         return params.get("charset", "UTF-8")
     else:
         return "UTF-8"