Issue 4014 - Publish python-abp on PyPI

abp/filters/sources.py

 # This file is part of Adblock Plus <https://adblockplus.org/>,
 # Copyright (C) 2006-present eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
 
 """Helper classes that handle IO for filter list parsing and rendering."""
 
 import io
 from os import path
 import sys
 
 try:
     from urllib2 import urlopen, HTTPError
-except ImportError:  # The module was renamed in Python 3.
+except ImportError:  # pragma: no py2 cover
+    # The module was renamed in Python 3
     from urllib.request import urlopen
     from urllib.error import HTTPError
 
 __all__ = ['NotFound', 'FSSource', 'TopSource', 'WebSource']
 
 
 class NotFound(Exception):
     """Requested file doesn't exist in this source.
 
     The file with requested name doesn't exist. If this results from an
@@ skipping 132 matching lines @@
         try:
             response = urlopen(url)
             info = response.info()
             # info.getparam became info.get_param in Python 3 so we'll
             # try both.
             get_param = (getattr(info, 'get_param', None)
                          or getattr(info, 'getparam', None))
             encoding = get_param('charset') or self.default_encoding
             for line in response:
                 yield line.decode(encoding).rstrip()
-        except HTTPError as err:
-            if err.code == 404:
-                raise NotFound("HTTP 404 Not found: '{}:{}'"
-                               .format(self.protocol, path_in_source))
-            raise err
+        except (HTTPError, ValueError) as err:
+            try:
+                if err.code == 404:
+                    raise NotFound("HTTP 404 Not found: '{}:{}'"
+                                   .format(self.protocol, path_in_source))
+            except AttributeError:  # Need to catch so the real err is raised
+                raise err

[Sebastian Noack, 2018/12/28 00:22:51]

Previously, when we got an HTTPError with a code other than 404, this error was
re-raised. Now, it will be silently ignored.

[rhowell, 2018/12/28 21:50:07]

Ah, you're right, thanks.