Merge pull request #2728 from rtfd/fix-ip-404

Fix 404 being raised on invalid IP.

Author: ericholscher

readthedocs/donate/signals.py

@@ -12,6 +12,7 @@
 
 if PROMO_GEO_PATH:
     import geoip2.database  # noqa
+    from geoip2.errors import AddressNotFoundError  # noqa
     geo_reader = geoip2.database.Reader(PROMO_GEO_PATH)
 
 
@@ -171,7 +172,7 @@ def attach_promo_data(sender, **kwargs):
             try:
                 geo_response = geo_reader.city(ip)
                 country_code = geo_response.country.iso_code
-            except ValueError:  # Invalid IP
+            except (AddressNotFoundError, ValueError):  # Invalid IP
                 country_code = None
 
     # Try to get a promo if we should be using one.