anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Format geoip error messages

Browse Source
This commit is contained in:
JonnyWong16
2016-07-01 09:30:31 -07:00
parent 1df6dadbdd
commit f5ba168172
5 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plexpy/helpers.py
View File

@@ -593,9 +593,11 @@ def geoip_lookup(ip_address):
return 'Missing GeoLite2 database. Please reinstall from the ' \
'<a href="settings?install_geoip=true">Settings</a> page.'
except ValueError as e:
return 'Unable to read GeoLite2 database: %s' % e
return 'Unable to read GeoLite2 database. Please reinstall from the ' \
'<a href="settings?reinstall_geoip=true">Settings</a> page.'
except maxminddb.InvalidDatabaseError as e:
return 'Invalid GeoLite2 database.'
return 'Invalid GeoLite2 database. Please reinstall from the ' \
'<a href="settings?reinstall_geoip=true">Settings</a> page.'
except geoip2.errors.AddressNotFoundError as e:
return '%s' % e
except Exception as e: