Merge pull request #123 from TotallyNotRobots/gonzobot+requests-error-warning

Make link_announcer only log when it errors, not raise

Author: linuxdaemon

.github/workflows/pythonapp.yml

@@ -47,3 +47,6 @@ jobs:
         PYTHONASYNCIODEBUG: ${{ matrix.asyncio-debug }}
         PYTHONPATH: .
     - uses: codecov/codecov-action@v1
+      with:
+        name: build-${{ matrix.python-ver}}-${{ matrix.asyncio-debug }}
+        fail_ci_if_error: true

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add Python 3.8 to testing matrix
 ### Changed
 - Refactor tests to remove dependency on mock library
+- Change link_announcer.py to only warn on connection errors
 ### Fixed
 - Fix matching exception in horoscope test
 - Fix youtube.py ISO time parse

.codecov.yml renamed to codecov.yml

@@ -23,14 +23,14 @@ def no_parens(pattern):
     r"""
     https? # Scheme
     ://
-    
+
     # Username and Password
     (?:
         (?:[^\[\]?/<~#`!@$%^&*()=+}|:";',>{\s]|%[0-9A-F]{2})*
         (?::(?:[^\[\]?/<~#`!@$%^&*()=+}|:";',>{\s]|%[0-9A-F]{2})*)?
         @
     )?
-    
+
     # Domain
     (?:
         # TODO Add support for IDNA hostnames as specified by RFC5891
@@ -41,13 +41,13 @@ def no_parens(pattern):
         )
         (?<![.,?!\]])  # Invalid end chars
     )
-    
+
     (?::\d*)?  # port
-    
+
     (?:/(?:""" + no_parens(PATH_SEG_CHARS) + r""")*(?<![.,?!\]]))*  # Path segment
-    
+
     (?:\?(?:""" + no_parens(QUERY_CHARS) + r""")*(?<![.,!\]]))?  # Query
-    
+
     (?:\#(?:""" + no_parens(FRAG_CHARS) + r""")*(?<![.,?!\]]))?  # Fragment
     """,
     re.IGNORECASE | re.VERBOSE
@@ -98,9 +98,12 @@ def print_url_title(message, match, logger):
 
             content = r.raw.read(MAX_RECV, decode_content=True)
             encoding = r.encoding
-    except requests.ReadTimeout:
+    except requests.exceptions.ReadTimeout:
         logger.debug("Read timeout reached for %r", match.group())
         return
+    except requests.ConnectionError:
+        logger.warning("Connection error in link_announcer.py", exc_info=1)
+        return
 
     html = parse_content(content, encoding)
 

plugins/link_announcer.py

@@ -239,3 +239,16 @@ def callback(resp):
 def test_change_encoding(body, encoding):
     # ISO-8859-1 is the default encoding requests would return if none is found
     assert parse_content(body, 'ISO-8859-1').original_encoding == encoding
+
+
+def test_connection_error(mock_requests):
+    url = "http://example.com"
+
+    match = url_re.search(url)
+    assert match
+    mck = MagicMock()
+    logger = MagicMock()
+
+    assert print_url_title(match=match, message=mck, logger=logger) is None
+
+    assert logger.warning.called