[Checkins] SVN: zc.form/trunk/ Got rid of ``zope.app.zapi`` dependency.
Michael Howitz
mh at gocept.com
Thu Sep 22 08:45:34 EST 2011
Log message for revision 122893:
Got rid of ``zope.app.zapi`` dependency.
Changed:
U zc.form/trunk/CHANGES.txt
U zc.form/trunk/setup.py
U zc.form/trunk/src/zc/form/browser/mruwidget.py
U zc.form/trunk/src/zc/form/browser/widgetapi.py
-=-
Modified: zc.form/trunk/CHANGES.txt
===================================================================
--- zc.form/trunk/CHANGES.txt 2011-09-22 13:12:30 UTC (rev 122892)
+++ zc.form/trunk/CHANGES.txt 2011-09-22 13:45:34 UTC (rev 122893)
@@ -5,13 +5,14 @@
0.2 (unreleased)
----------------
+- Got rid of ``zope.app.zapi`` dependency.
+
- Fixed tests to run with ``zope.schema`` >= 3.6.
- Using Python's ``doctest`` module instead of depreacted
``zope.testing.doctest``.
-
0.1
---
Modified: zc.form/trunk/setup.py
===================================================================
--- zc.form/trunk/setup.py 2011-09-22 13:12:30 UTC (rev 122892)
+++ zc.form/trunk/setup.py 2011-09-22 13:45:34 UTC (rev 122893)
@@ -19,7 +19,6 @@
'zope.app.catalog',
'zope.app.form',
'zope.app.pagetemplate',
- 'zope.app.zapi',
'zope.cachedescriptors',
'zope.component',
'zope.exceptions',
Modified: zc.form/trunk/src/zc/form/browser/mruwidget.py
===================================================================
--- zc.form/trunk/src/zc/form/browser/mruwidget.py 2011-09-22 13:12:30 UTC (rev 122892)
+++ zc.form/trunk/src/zc/form/browser/mruwidget.py 2011-09-22 13:45:34 UTC (rev 122893)
@@ -11,23 +11,18 @@
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
-"""source input widget with most recently used (MRU) value support
-
-$Id: mruwidget.py 3677 2005-10-19 07:10:22Z fred $
-"""
-import cgi
-
-import persistent.list
+"""source input widget with most recently used (MRU) value support"""
from BTrees import OOBTree
-
-import zope.app.form.interfaces
-import zope.app.form.browser.interfaces
-from zope.app import zapi
from zope.app.form.browser.source import SourceInputWidget
from zope.schema.interfaces import ISourceQueriables, ValidationError
+import cgi
+import persistent.list
+import zc.resourcelibrary
import zope.annotation.interfaces
+import zope.app.form.browser.interfaces
+import zope.app.form.interfaces
+import zope.component
-import zc.resourcelibrary
class MruSourceInputWidget(SourceInputWidget):
ANNOTATION_KEY = 'zc.form.browser.mruwidget'
@@ -51,13 +46,13 @@
tokens = annotation[key] = persistent.list.PersistentList()
return tokens
-
+
def getMostRecentlyUsedTerms(self):
"""Get a sequence of the most recently used terms (most recent first).
"""
tokens = self.getMostRecentlyUsedTokens()
- terms = zapi.getMultiAdapter((self.source, self.request),
- zope.app.form.browser.interfaces.ITerms)
+ terms = zope.component.getMultiAdapter(
+ (self.source, self.request), zope.app.form.browser.interfaces.ITerms)
mru = []
for token in tokens:
try:
@@ -88,7 +83,7 @@
for name, queryview in self.queryviews:
if name+'.apply' in self.request:
return True
-
+
def __call__(self):
zc.resourcelibrary.need('zc.form.mruwidget')
result = ['<div class="value">']
@@ -116,7 +111,7 @@
queries_visible = 'no'
result.append('<input type="hidden" name="%s.visible" '
- 'id="%s.visible" value="%s">'
+ 'id="%s.visible" value="%s">'
% (queries_id, queries_id, queries_visible))
if mru_terms:
@@ -128,8 +123,8 @@
else:
selected = ''
result.append(' <option value="%s"%s>%s</option>'
- % (cgi.escape(mru_term.token),
- selected,
+ % (cgi.escape(mru_term.token),
+ selected,
cgi.escape(mru_term.title)))
result.append('</select>')
@@ -141,7 +136,7 @@
result.append(' <input type="hidden" name="%s.displayed" value="y">'
% self.name)
-
+
result.append(' <div class="queries" id="%s" style="%s">'
% (queries_id, queries_style))
for name, queryview in self.queryviews:
@@ -159,3 +154,4 @@
result.append(' </div> <!-- queries -->')
result.append('</div> <!-- value -->')
return '\n'.join(result)
+
Modified: zc.form/trunk/src/zc/form/browser/widgetapi.py
===================================================================
--- zc.form/trunk/src/zc/form/browser/widgetapi.py 2011-09-22 13:12:30 UTC (rev 122892)
+++ zc.form/trunk/src/zc/form/browser/widgetapi.py 2011-09-22 13:45:34 UTC (rev 122893)
@@ -22,7 +22,6 @@
from zope.interface import implements
from zope.schema.interfaces import ValidationError
-from zope.app import zapi
from zope.app.form import InputWidget
from zope.app.form.browser.widget import BrowserWidget
from zope.app.form.browser.interfaces import IBrowserWidget
@@ -114,7 +113,7 @@
self._initialize()
marker = self._get_marker()
return marker + self.render(self._data)
-
+
def hidden(self):
if not self._initialized:
self._initialize()
@@ -220,7 +219,7 @@
class BaseVocabularyDisplay(BaseVocabularyWidget):
-
+
_display = True
def render(self, value):
More information about the checkins
mailing list