Merge branch 'nightly' into python3

# Conflicts:
#	plexpy/activity_pinger.py
#	plexpy/webserve.py
This commit is contained in:
JonnyWong16 2020-04-28 18:44:41 -07:00
commit 4e0563bbf9
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
5 changed files with 42 additions and 8 deletions

View file

@ -946,7 +946,7 @@ class PlexTV(object):
return account_details
def get_geoip_lookup(self, ip_address=''):
if not ip_address or not helpers.is_public_ip(ip_address):
if not ip_address or not helpers.is_valid_ip(ip_address):
return
geoip_data = self.get_plextv_geoip(ip_address=ip_address, output_format='xml')