[wwwsearch-commits] r17951 - wwwsearch/ClientForm/trunk
jjlee at codespeak.net
jjlee at codespeak.net
Wed Sep 28 22:49:09 CEST 2005
Author: jjlee
Date: Wed Sep 28 22:49:08 2005
New Revision: 17951
Modified:
wwwsearch/ClientForm/trunk/ClientForm.py
wwwsearch/ClientForm/trunk/test.py
Log:
Normalise comments
Modified: wwwsearch/ClientForm/trunk/ClientForm.py
==============================================================================
--- wwwsearch/ClientForm/trunk/ClientForm.py (original)
+++ wwwsearch/ClientForm/trunk/ClientForm.py Wed Sep 28 22:49:08 2005
@@ -593,7 +593,7 @@
d = {}
for key, val in attrs:
d[key] = val
- taken = bool(d.get("for")) # empty id is invalid
+ taken = bool(d.get("for")) # empty id is invalid
d["__text"] = ""
d["__taken"] = taken
if taken:
@@ -607,12 +607,13 @@
return
self._current_label = None
label["__text"] = label["__text"]
- del label["__taken"] # if it is staying around, it is True in all cases
+ # if it is staying around, it is True in all cases
+ del label["__taken"]
def _add_label(self, d):
if self._current_label is not None:
if self._current_label["__taken"]:
- self.end_label() # be fuzzy
+ self.end_label() # be fuzzy
else:
self._current_label["__taken"] = True
d["__label"] = self._current_label
@@ -742,7 +743,7 @@
try:
method = getattr(self, "do_" + tag)
except AttributeError:
- pass # unknown tag
+ pass # unknown tag
else:
method(attrs)
else:
@@ -752,7 +753,7 @@
try:
method = getattr(self, "end_" + tag)
except AttributeError:
- pass # unknown tag
+ pass # unknown tag
else:
method()
@@ -883,6 +884,8 @@
For the other arguments and further details, see ParseResponse.__doc__.
"""
+ if backwards_compat:
+ deprecation("operating in backwards-compatibility mode")
fp = form_parser_class(entitydefs)
while 1:
data = file.read(CHUNK)
@@ -1561,7 +1564,7 @@
"""
if not isstringlike(label):
raise TypeError("item label must be string-like")
- items = [] # order is important
+ items = [] # order is important
for o in self.items:
if not exclude_disabled or not o.disabled:
for l in o.get_labels():
@@ -1617,8 +1620,6 @@
raise AttributeError.
"""
- deprecation(
- "item = control.get(...); item.selected = not item.selected")
o = self.get(name, by_label, nr)
self._set_selected_state(o, not o.selected)
@@ -1929,7 +1930,7 @@
res.append(None)
return res
- def possible_items(self, by_label=False): # disabled are not possible
+ def possible_items(self, by_label=False): # disabled are not possible
"""Deprecated: return the names or labels of all possible items.
Includes disabled items, which may be misleading for some use cases.
@@ -2475,9 +2476,9 @@
self.attrs = {}
self.controls = []
self._request_class = request_class
- self._forms = forms # this is a semi-public API!
- self._labels = labels # this is a semi-public API!
- self._id_to_labels = id_to_labels # this is a semi-public API!
+ self._forms = forms # this is a semi-public API!
+ self._labels = labels # this is a semi-public API!
+ self._id_to_labels = id_to_labels # this is a semi-public API!
self.backwards_compat = backwards_compat
def new_control(self, type, name, attrs,
@@ -2622,14 +2623,14 @@
#---------------------------------------------------
# Form-filling methods applying only to ListControls.
- def possible_items(self, # deprecated
+ def possible_items(self, # deprecated
name=None, type=None, kind=None, id=None,
nr=None, by_label=False, label=None):
"""Return a list of all values that the specified control can take."""
c = self._find_list_control(name, type, kind, id, label, nr)
return c.possible_items(by_label)
- def set(self, selected, item_name, # deprecated
+ def set(self, selected, item_name, # deprecated
name=None, type=None, kind=None, id=None, nr=None,
by_label=False, label=None):
"""Select / deselect named list item.
@@ -2639,14 +2640,14 @@
"""
self._find_list_control(name, type, kind, id, label, nr).set(
selected, item_name, by_label)
- def toggle(self, item_name, # deprecated
+ def toggle(self, item_name, # deprecated
name=None, type=None, kind=None, id=None, nr=None,
by_label=False, label=None):
"""Toggle selected state of named list item."""
self._find_list_control(name, type, kind, id, label, nr).toggle(
item_name, by_label)
- def set_single(self, selected, # deprecated
+ def set_single(self, selected, # deprecated
name=None, type=None, kind=None, id=None,
nr=None, by_label=None, label=None):
"""Select / deselect list item in a control having only one item.
@@ -2663,16 +2664,16 @@
control.toggle("on")
control.toggle_single()
- """ # by_label ignored and deprecated
+ """ # by_label ignored and deprecated
self._find_list_control(
name, type, kind, id, label, nr).set_single(selected)
def toggle_single(self, name=None, type=None, kind=None, id=None,
- nr=None, by_label=None, label=None): # deprecated
+ nr=None, by_label=None, label=None): # deprecated
"""Toggle selected state of list item in control having only one item.
The rest is as for HTMLForm.set_single.__doc__.
- """ # by_label ignored and deprecated
+ """ # by_label ignored and deprecated
self._find_list_control(name, type, kind, id, label, nr).toggle_single()
#---------------------------------------------------
Modified: wwwsearch/ClientForm/trunk/test.py
==============================================================================
--- wwwsearch/ClientForm/trunk/test.py (original)
+++ wwwsearch/ClientForm/trunk/test.py Wed Sep 28 22:49:08 2005
@@ -1740,7 +1740,7 @@
self.failIf(c1.items[0].selected)
self.failUnless(c1.items[1].selected)
self.failIf(c1.items[2].selected)
- c1.value = ['value_value'] # should be no change
+ c1.value = ['value_value'] # should be no change
self.failUnless(c1.items[1].selected)
self.assertEqual(c1.value, ['value_value'])
c1.value = ['another_value']
@@ -1758,7 +1758,7 @@
'__text':'Second Option'})]
form._id_to_labels['name_value_3'] = [
ClientForm.Label({'for': 'name_value_3',
- '__text':'Last Option'})] # notice __label above
+ '__text':'Last Option'})] # notice __label above
self.assertEqual([l.text for l in c1.items[0].get_labels()],
['First Option'])
self.assertEqual([l.text for l in c1.items[1].get_labels()],
@@ -1775,10 +1775,10 @@
c1.items[1].selected = True
self.assertEqual(c1.get_value_by_label(), ['Second Option'])
self.assertEqual(c1.value, ['value_value'])
- c1.set_value_by_label(['Last Option']) # by second label
+ c1.set_value_by_label(['Last Option']) # by second label
self.assertEqual(c1.get_value_by_label(), ['Third Option'])
self.assertEqual(c1.value, ['another_value'])
- c1.set_value_by_label(['irst']) # by substring
+ c1.set_value_by_label(['irst']) # by substring
self.assertEqual(c1.get_value_by_label(), ['First Option'])
class FormTests(TestCase):
@@ -2386,7 +2386,7 @@
(form.find_control("form.country"), "zimbabwe"),
(form.find_control("form.quality"), "good")):
# warnings are nasty. :-(
- raise_deprecations() # clear onceregistry
+ raise_deprecations() # clear onceregistry
try:
c.possible_items()
except DeprecationWarning:
More information about the wwwsearch-commits
mailing list