diff --git a/ivatar/ivataraccount/gravatar.py b/ivatar/ivataraccount/gravatar.py index 0de88dd..a1889be 100644 --- a/ivatar/ivataraccount/gravatar.py +++ b/ivatar/ivataraccount/gravatar.py @@ -24,21 +24,21 @@ def get_photo(email): try: urlopen(image_url, timeout=URL_TIMEOUT) - except HTTPError as e: # pylint: disable=invalid-name - if e.code != 404 and e.code != 503: + except HTTPError as exc: + if exc.code != 404 and exc.code != 503: print( # pragma: no cover 'Gravatar fetch failed with an unexpected %s HTTP error' % - e.code) + exc.code) return False - except URLError as e: # pragma: no cover # pylint: disable=invalid-name + except URLError as exc: # pragma: no cover print( 'Gravatar fetch failed with URL error: %s' % - e.reason) # pragma: no cover + exc.reason) # pragma: no cover return False # pragma: no cover - except SSLError as e: # pragma: no cover # pylint: disable=invalid-name + except SSLError as exc: # pragma: no cover print( 'Gravatar fetch failed with SSL error: %s' % - e.reason) # pragma: no cover + exc.reason) # pragma: no cover return False # pragma: no cover return { diff --git a/ivatar/ivataraccount/models.py b/ivatar/ivataraccount/models.py index 3a43f67..1e1d62f 100644 --- a/ivatar/ivataraccount/models.py +++ b/ivatar/ivataraccount/models.py @@ -141,15 +141,15 @@ class Photo(BaseAccountModel): try: image = urlopen(image_url) # No idea how to test this - # pragma: no cover # pylint: disable=invalid-name - except HTTPError as e: + # pragma: no cover + except HTTPError as exc: print('%s import failed with an HTTP error: %s' % - (service_name, e.code)) + (service_name, exc.code)) return False # No idea how to test this # pragma: no cover - except URLError as e: # pylint: disable=invalid-name - print('%s import failed: %s' % (service_name, e.reason)) + except URLError as exc: + print('%s import failed: %s' % (service_name, exc.reason)) return False data = image.read()