From f17fa2661119ea5f9e348363d91a5b579e339bf4 Mon Sep 17 00:00:00 2001
From: Thibault Roche <thibault.roche@planisware.com>
Date: Tue, 27 Nov 2018 10:28:16 +0100
Subject: [PATCH 1/3] handle <option> tag without value option

---
 mechanicalsoup/browser.py |  5 +++--
 mechanicalsoup/form.py    | 10 ++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/mechanicalsoup/browser.py b/mechanicalsoup/browser.py
index db0616b0..88611a87 100644
--- a/mechanicalsoup/browser.py
+++ b/mechanicalsoup/browser.py
@@ -195,7 +195,7 @@ def _request(self, form, url=None, **kwargs):
 
             elif tag.name == "select":
                 options = tag.select("option")
-                selected_values = [i.get("value", "") for i in options
+                selected_values = [i.get("value", i.text) for i in options
                                    if "selected" in i.attrs]
                 if "multiple" in tag.attrs:
                     for value in selected_values:
@@ -206,7 +206,8 @@ def _request(self, form, url=None, **kwargs):
                     data.append((name, selected_values[-1]))
                 elif options:
                     # Selects the first option if none are selected
-                    data.append((name, options[0].get("value", "")))
+                    data.append((name, options[0].get("value",
+                                                      options[0].text)))
 
         if method.lower() == "get":
             kwargs["params"] = data
diff --git a/mechanicalsoup/form.py b/mechanicalsoup/form.py
index ee6a1b3d..c3b731f5 100644
--- a/mechanicalsoup/form.py
+++ b/mechanicalsoup/form.py
@@ -216,6 +216,16 @@ def set_select(self, data):
 
             for choice in value:
                 option = select.find("option", {"value": choice})
+
+                # try to find with text instead of value
+                if not option:
+                    option = select.find("option", string=choice)
+
+                if not option:
+                    raise LinkNotFoundError(
+                        'Option %s not found for select %s' % (choice, name)
+                    )
+
                 option.attrs["selected"] = "selected"
 
     def __setitem__(self, name, value):

From d54822602a63cb5edfeeee4bc08df7048aeee112 Mon Sep 17 00:00:00 2001
From: Thibault Roche <thibault.roche@planisware.com>
Date: Tue, 27 Nov 2018 10:29:26 +0100
Subject: [PATCH 2/3] test for option without value

---
 tests/test_form.py | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/tests/test_form.py b/tests/test_form.py
index acfc43bc..10c4e679 100644
--- a/tests/test_form.py
+++ b/tests/test_form.py
@@ -458,5 +458,42 @@ def test_choose_submit_buttons(expected_post):
     assert res.status_code == 200 and res.text == 'Success!'
 
 
+@pytest.mark.parametrize("fail, selected, expected_post", [
+    pytest.param(False, 'with_value', [('selector', 'with_value')],
+                 id='Option with value'),
+    pytest.param(False, 'Without value', [('selector', 'Without value')],
+                 id='Option without value'),
+    pytest.param(False, 'We have a value here', [('selector', 'with_value')],
+                 id='Option with value selected by its text'),
+    pytest.param(True, 'Unknown option', None,
+                 id='Unknown option, must raise a LinkNotFound exception')
+
+])
+def test_option_without_value(fail, selected, expected_post):
+    """Option tag in select can have no value option"""
+    text = """
+    <form method="post" action="mock://form.com/post">
+<select name="selector">
+<option value="with_value">We have a value here</option>
+<option>Without value</option>
+</select>
+<button type="submit">Submit</button>
+</form>
+"""
+    expected_post = expected_post
+    browser, url = setup_mock_browser(expected_post=expected_post,
+                                      text=text)
+    browser.open(url)
+    browser.select_form()
+    if fail:
+        with pytest.raises(mechanicalsoup.utils.LinkNotFoundError):
+            browser['selector'] = selected
+    else:
+        browser['selector'] = selected
+
+        res = browser.submit_selected()
+        assert res.status_code == 200 and res.text == 'Success!'
+
+
 if __name__ == '__main__':
     pytest.main(sys.argv)

From c54b19f95d8bf8f954e35594117b41644f268745 Mon Sep 17 00:00:00 2001
From: Dan Hemberger <daniel.hemberger@gmail.com>
Date: Tue, 27 Nov 2018 10:23:55 -0800
Subject: [PATCH 3/3] Handle <option> tags without value attributes

1. The `Form.set_select` method will now select an <option> whose text
   matches the `data` argument if no matching value-attribute is found
   (even if the <option> it selects still has a value attribute).

2. When determining what form data to submit, selected <option> tags
   that do not have a value attribute will submit their text as the
   value instead.

This change is made in accordance with the standard processing
of <option> tags. See:

https://www.w3schools.com/tags/att_option_value.asp

> Note: If the value attribute is not specified, the content will
> be passed as a value instead.

Additionally, the `string` argument to bs4's `find` function
requires beautifulsoup4 version 4.4 or greater.
https://www.crummy.com/software/BeautifulSoup/bs4/doc/#the-string-argument
---
 mechanicalsoup/browser.py |  6 ++++--
 mechanicalsoup/form.py    |  7 ++++---
 requirements.txt          |  2 +-
 tests/test_form.py        | 16 +++++++---------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/mechanicalsoup/browser.py b/mechanicalsoup/browser.py
index 88611a87..3fb66a6d 100644
--- a/mechanicalsoup/browser.py
+++ b/mechanicalsoup/browser.py
@@ -194,6 +194,8 @@ def _request(self, form, url=None, **kwargs):
                 data.append((name, tag.text))
 
             elif tag.name == "select":
+                # If the value attribute is not specified, the content will
+                # be passed as a value instead.
                 options = tag.select("option")
                 selected_values = [i.get("value", i.text) for i in options
                                    if "selected" in i.attrs]
@@ -206,8 +208,8 @@ def _request(self, form, url=None, **kwargs):
                     data.append((name, selected_values[-1]))
                 elif options:
                     # Selects the first option if none are selected
-                    data.append((name, options[0].get("value",
-                                                      options[0].text)))
+                    first_value = options[0].get("value", options[0].text)
+                    data.append((name, first_value))
 
         if method.lower() == "get":
             kwargs["params"] = data
diff --git a/mechanicalsoup/form.py b/mechanicalsoup/form.py
index c3b731f5..ab28e8cc 100644
--- a/mechanicalsoup/form.py
+++ b/mechanicalsoup/form.py
@@ -193,9 +193,10 @@ def set_select(self, data):
         :param data: Dict of ``{name: value, ...}``.
             Find the select element whose *name*-attribute is ``name``.
             Then select from among its children the option element whose
-            *value*-attribute is ``value``. If the select element's
-            *multiple*-attribute is set, then ``value`` can be a list
-            or tuple to select multiple options.
+            *value*-attribute is ``value``. If no matching *value*-attribute
+            is found, this will search for an option whose text matches
+            ``value``. If the select element's *multiple*-attribute is set,
+            then ``value`` can be a list or tuple to select multiple options.
         """
         for (name, value) in data.items():
             select = self.form.find("select", {"name": name})
diff --git a/requirements.txt b/requirements.txt
index 83a69311..1ebc4d7f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 requests >= 2.0
-beautifulsoup4
+beautifulsoup4 >= 4.4
 six >= 1.4
 lxml
diff --git a/tests/test_form.py b/tests/test_form.py
index 10c4e679..8db20429 100644
--- a/tests/test_form.py
+++ b/tests/test_form.py
@@ -467,20 +467,18 @@ def test_choose_submit_buttons(expected_post):
                  id='Option with value selected by its text'),
     pytest.param(True, 'Unknown option', None,
                  id='Unknown option, must raise a LinkNotFound exception')
-
 ])
 def test_option_without_value(fail, selected, expected_post):
     """Option tag in select can have no value option"""
     text = """
     <form method="post" action="mock://form.com/post">
-<select name="selector">
-<option value="with_value">We have a value here</option>
-<option>Without value</option>
-</select>
-<button type="submit">Submit</button>
-</form>
-"""
-    expected_post = expected_post
+      <select name="selector">
+        <option value="with_value">We have a value here</option>
+        <option>Without value</option>
+      </select>
+      <button type="submit">Submit</button>
+    </form>
+    """
     browser, url = setup_mock_browser(expected_post=expected_post,
                                       text=text)
     browser.open(url)