Merge branch 'nightly' into python3

# Conflicts: # plexpy/activity_pinger.py # plexpy/webserve.py
2020-04-28 18:44:41 -07:00
parent a8783ac351 e2e7063a29
commit 4e0563bbf9
5 changed files with 42 additions and 8 deletions
--- a/plexpy/plextv.py
+++ b/plexpy/plextv.py
@@ -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')