Backport pull request #2235

isup: catch up errors from get site and from requests differently

Requirements changes have been adapted to 7.1.x's stack.

Author: dgw

requirements.txt

@@ -10,9 +10,9 @@ geoip2>=4.0,<5.0; python_version >= '3.6'
 # transitive dependency of geoip2; v2 dropped py2.7 & py3 < 3.6
 maxminddb<2.0; python_version < '3.6'
 ipaddress<2.0; python_version < '3.3'
-requests>=2.0.0,<3.0.0; python_version != '3.3'
+requests>=2.24.0,<3.0.0; python_version != '3.3'
 # py3.3 doesn't work with the chardet/charset-normalizer detection added in 2.26
-requests>=2.0.0,<2.26; python_version == '3.3'
+requests>=2.24.0,<2.26; python_version == '3.3'
 # transitive dependency of requests
 # 2.0 will drop EOL Python 2.7 & 3.5, just like Sopel 8 plans to
 urllib3<1.27; python_version != '3.3' and python_version != '3.4'

sopel/modules/isup.py

@@ -60,10 +60,13 @@ def handle_isup(bot, trigger, secure=True):
     """
     try:
         site = get_site_url(trigger.group(2))
-        response = requests.head(site, verify=secure, timeout=(10.0, 5.0))
-        response.raise_for_status()
     except ValueError as error:
         bot.reply(str(error))
+        return
+
+    try:
+        response = requests.head(site, verify=secure, timeout=(10.0, 5.0))
+        response.raise_for_status()
     except requests.exceptions.SSLError:
         bot.say(
             '{} looks down to me (SSL error). Try using `{}isupinsecure`.'
@@ -84,6 +87,8 @@ def handle_isup(bot, trigger, secure=True):
         bot.say(
             '{} looks down to me (connection error).'
             .format(site))
+    except ValueError:
+        bot.reply('"{}" is not a valid URL.'.format(site))
     else:
         # If no exception happened, the request must have succeeded.
         bot.say(site + ' looks fine to me.')

test/modules/test_modules_isup.py

@@ -115,15 +115,15 @@ def test_isup_command_unparseable(irc, bot, user, requests_mock):
     """Test URL that can't be parsed."""
     requests_mock.head(
         'http://.foo',
-        exc=ValueError("Failed to parse: '.foo', label empty or too long"),
+        exc=ValueError("Invalid URL"),
     )
 
     irc.pm(user, '.isup .foo')
 
     assert len(bot.backend.message_sent) == 1, (
         '.isup command should output exactly one line')
     assert bot.backend.message_sent == rawlist(
-        'PRIVMSG User :User: Failed to parse: \'.foo\', label empty or too long'
+        'PRIVMSG User :User: "http://.foo" is not a valid URL.'
     )