[Checkins] SVN: zope.mimetype/trunk/ Use the ITerms interface from zope.browser.

[Hanno Schlichting]

Log message for revision 107104:
  Use the ITerms interface from zope.browser.
  

Changed:
  U   zope.mimetype/trunk/CHANGES.txt
  U   zope.mimetype/trunk/setup.py
  U   zope.mimetype/trunk/src/zope/mimetype/source.py
  U   zope.mimetype/trunk/src/zope/mimetype/widget.txt

-=-
Modified: zope.mimetype/trunk/CHANGES.txt
===================================================================
--- zope.mimetype/trunk/CHANGES.txt	2009-12-26 16:14:28 UTC (rev 107103)
+++ zope.mimetype/trunk/CHANGES.txt	2009-12-26 17:08:34 UTC (rev 107104)
@@ -5,8 +5,11 @@
 1.2.0 (unreleased)
 ------------------
 
+- Use the ITerms interface from zope.browser.
+
 - Declared missing dependencies, resolved direct dependency on
   zope.app.publisher.
+
 - Import content-type parser from zope.contenttype, adding a dependency on
   that package.
 

Modified: zope.mimetype/trunk/setup.py
===================================================================
--- zope.mimetype/trunk/setup.py	2009-12-26 16:14:28 UTC (rev 107103)
+++ zope.mimetype/trunk/setup.py	2009-12-26 17:08:34 UTC (rev 107104)
@@ -84,6 +84,7 @@
                 ]),
       install_requires=['setuptools',
                         'zope.app.form',
+                        'zope.browser',
                         'zope.browserresource',
                         'zope.component',
                         'zope.configuration',

Modified: zope.mimetype/trunk/src/zope/mimetype/source.py
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/source.py	2009-12-26 16:14:28 UTC (rev 107103)
+++ zope.mimetype/trunk/src/zope/mimetype/source.py	2009-12-26 17:08:34 UTC (rev 107104)
@@ -17,7 +17,7 @@
 
 import sys
 
-import zope.app.form.browser.interfaces
+from zope.browser.interfaces import ITerms
 import zope.component
 import zope.mimetype.interfaces
 import zope.publisher.interfaces.browser
@@ -62,8 +62,7 @@
 class Terms(object):
     """Utility to provide terms for content type interfaces."""
 
-    zope.interface.implements(
-        zope.app.form.browser.interfaces.ITerms)
+    zope.interface.implements(ITerms)
 
     def __init__(self, source, request):
         self.context = source
@@ -188,7 +187,7 @@
         charset = zope.component.queryUtility(
             zope.mimetype.interfaces.ICodecPreferredCharset,
             name=self.value.name)
-        if codec is None:
+        if charset is None:
             available = [(name, charset)
                          for (charset, name) in zope.component.getUtilitiesFor(
                              zope.mimetype.interfaces.ICharset)

Modified: zope.mimetype/trunk/src/zope/mimetype/widget.txt
===================================================================
--- zope.mimetype/trunk/src/zope/mimetype/widget.txt	2009-12-26 16:14:28 UTC (rev 107103)
+++ zope.mimetype/trunk/src/zope/mimetype/widget.txt	2009-12-26 17:08:34 UTC (rev 107104)
@@ -17,12 +17,11 @@
     ...     zope.interface.implements(zope.schema.interfaces.IIterableSource)
 
     >>> import zope.publisher.interfaces.browser
-    >>> import zope.app.form.browser.interfaces
+    >>> from zope.browser.interfaces import ITerms
     >>> from zope.schema.vocabulary import SimpleTerm
     >>> class ListTerms:
     ...
-    ...     zope.interface.implements(
-    ...         zope.app.form.browser.interfaces.ITerms)
+    ...     zope.interface.implements(ITerms)
     ...
     ...     def __init__(self, source, request):
     ...         pass # We don't actually need the source or the request :)