[Checkins] SVN: zope.file/trunk/s Remove dependency on zope.app.form

[Gediminas Paulauskas]

Log message for revision 123876:
  Remove dependency on zope.app.form

Changed:
  U   zope.file/trunk/setup.py
  U   zope.file/trunk/src/zope/file/contenttype.py
  U   zope.file/trunk/src/zope/file/ftesting.zcml

-=-
Modified: zope.file/trunk/setup.py
===================================================================
--- zope.file/trunk/setup.py	2012-01-02 12:19:17 UTC (rev 123875)
+++ zope.file/trunk/setup.py	2012-01-02 12:36:01 UTC (rev 123876)
@@ -70,14 +70,13 @@
                 'zope.testbrowser']),
      install_requires=['setuptools',
                        'ZODB3',
-                       'zope.app.form',
                        'zope.component',
                        'zope.browser',
                        'zope.container',
-                       'zope.contenttype>=3.5.0dev',
+                       'zope.contenttype>=3.5',
                        'zope.event',
                        'zope.filerepresentation',
-                       'zope.formlib',
+                       'zope.formlib>=4',
                        'zope.i18nmessageid',
                        'zope.lifecycleevent',
                        'zope.interface',

Modified: zope.file/trunk/src/zope/file/contenttype.py
===================================================================
--- zope.file/trunk/src/zope/file/contenttype.py	2012-01-02 12:19:17 UTC (rev 123875)
+++ zope.file/trunk/src/zope/file/contenttype.py	2012-01-02 12:36:01 UTC (rev 123876)
@@ -15,9 +15,9 @@
 """
 __docformat__ = "reStructuredText"
 
-import zope.app.form.interfaces
 import zope.component
 import zope.formlib.form
+import zope.formlib.interfaces
 import zope.interface
 import zope.lifecycleevent
 import zope.mimetype.event
@@ -60,7 +60,7 @@
                 if consumed != len(content_data):
                     raise UnicodeError("not all data decoded")
             except UnicodeError:
-                err = zope.app.form.interfaces.WidgetInputError(
+                err = zope.formlib.interfaces.WidgetInputError(
                     codec_field.__name__,
                     codec_field.field.title,
                     "Selected encoding cannot decode document.")

Modified: zope.file/trunk/src/zope/file/ftesting.zcml
===================================================================
--- zope.file/trunk/src/zope/file/ftesting.zcml	2012-01-02 12:19:17 UTC (rev 123875)
+++ zope.file/trunk/src/zope/file/ftesting.zcml	2012-01-02 12:36:01 UTC (rev 123876)
@@ -2,7 +2,7 @@
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
     xmlns:zcml="http://namespaces.zope.org/zcml"
-    i18n_domain="zc.catalog"
+    i18n_domain="zope.file"
     >
 
   <include