github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-12 16:22:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'nightly' into python3

Browse source 
# Conflicts:
#	plexpy/notification_handler.py
This commit is contained in:
JonnyWong16 2019-12-11 11:39:59 -08:00
commit 411d88d798
2 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plexpy/helpers.py
View file

@ -586,7 +586,7 @@ def get_ip(host):
ip_address = ''
if is_valid_ip(host):
return host
elif not re.fullmatch(r'[0-9]+(?:\.[0-9]+){3}(?!\d*-[a-z0-9]{6})', host):
elif not re.match(r'^[0-9]+(?:\.[0-9]+){3}(?!\d*-[a-z0-9]{6})$', host):
try:
ip_address = socket.getaddrinfo(host, None)[0][4][0]
logger.debug("IP Checker :: Resolved %s to %s." % (host, ip_address))