Allow .select() on select fields.

This just moves the implementation from Form to Select.

3 files changed, 27 insertions, 20 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6c52061..29b51e2 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,7 +4,8 @@ News
 2.0.14 (unreleased)
 -------------------
 
-- Nothing changed yet.
+- Allow `.select()` on <select>s and <select multiple>s.
+  [Markus Bertheau]
 
 
 2.0.13 (2014-01-23)
diff --git a/docs/forms.txt b/docs/forms.txt
index 9b40434..74fc6a3 100644
--- a/docs/forms.txt
+++ b/docs/forms.txt
@@ -100,7 +100,7 @@ You can select an option by its text with ``.select()``:
 
 .. code-block:: python
 
-    >>> form.select('select', text="Option 2")
+    >>> form['select'].select(text="Option 2")
     >>> print(form['select'].value)
     option2
 
@@ -108,9 +108,9 @@ For select multiple use ``.select_multiple()``:
 
 .. code-block:: python
 
-    >>> form.select_multiple('multiple', texts=["Option 1", "Option 2"])
+    >>> form['multiple'].select_multiple(texts=["Option 1", "Option 2"])
     >>> print(form['multiple'].value) # doctest: +SKIP
-    [u'option1', u'option2']
+    ['option1', 'option2']
 
 Select fields can only be set to valid values (i.e., values in an ``<option>``)
 but you can also use ``.force_value()`` to enter values not present in an
diff --git a/webtest/forms.py b/webtest/forms.py
index 9cc716c..82ece13 100644
--- a/webtest/forms.py
+++ b/webtest/forms.py
@@ -112,7 +112,16 @@ class Select(Field):
         """
         self._forced_value = value
 
-    def get_value_for_text(self, text):
+    def select(self, value=None, text=None):
+        if value is not None and text is not None:
+            raise ValueError("Specify only one of value and text.")
+
+        if text is not None:
+            value = self._get_value_for_text(text)
+
+        self.value = value
+
+    def _get_value_for_text(self, text):
         for i, (option_value, checked, option_text) in enumerate(self.options):
             if option_text == utils.stringify(text):
                 return option_value
@@ -167,7 +176,16 @@ class MultipleSelect(Field):
         self._forced_values = values
         self.selectedIndices = []
 
-    def get_value_for_texts(self, texts):
+    def select_multiple(self, value=None, texts=None):
+        if value is not None and texts is not None:
+            raise ValueError("Specify only one of value and texts.")
+
+        if texts is not None:
+            value = self._get_value_for_texts(texts)
+
+        self.value = value
+
+    def _get_value_for_texts(self, texts):
         str_texts = [utils.stringify(text) for text in texts]
         value = []
         for i, (option, checked, text) in enumerate(self.options):
@@ -550,13 +568,7 @@ class Form(object):
         field = self.get(name, index=index)
         assert isinstance(field, Select)
 
-        if value is not None and text is not None:
-            raise ValueError("Specify only one of value and text.")
-
-        if text is not None:
-            value = field.get_value_for_text(text)
-
-        field.value = value
+        field.select(value, text)
 
     def select_multiple(self, name, value=None, texts=None, index=None):
         """Like ``.set()``, except also confirms the target is a
@@ -565,13 +577,7 @@ class Form(object):
         field = self.get(name, index=index)
         assert isinstance(field, MultipleSelect)
 
-        if value is not None and texts is not None:
-            raise ValueError("Specify only one of value and texts.")
-
-        if texts is not None:
-            value = field.get_value_for_texts(texts)
-
-        field.value = value
+        field.select_multiple(value, texts)
 
     def submit(self, name=None, index=None, value=None, **args):
         """Submits the form.  If ``name`` is given, then also select that