Avoid bare exceptions

This commit is contained in:
shortcutme 2019-08-02 14:04:18 +02:00
parent 08b7034d6f
commit 06406fa46c
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 6 additions and 6 deletions

View file

@ -99,6 +99,6 @@ class UiRequestPlugin(object):
site = self.server.sites[path_parts["address"]]
try:
path_parts["address"], path_parts["inner_path"] = getCorsPath(site, path_parts["inner_path"])
except:
except Exception:
return None
return path_parts

View file

@ -144,7 +144,7 @@ def getFilename(path):
def getFilesize(path):
try:
s = os.stat(path)
except:
except Exception:
return None
if stat.S_ISREG(s.st_mode): # Test if it's file
return s.st_size
@ -246,14 +246,14 @@ def isIp(ip):
try:
socket.inet_pton(socket.AF_INET6, ip)
return True
except:
except Exception:
return False
else: # IPv4
try:
socket.inet_aton(ip)
return True
except:
except Exception:
return False
@ -291,12 +291,12 @@ def getInterfaceIps(ip_type="ipv4"):
s = createSocket(test_ip, sock_type=socket.SOCK_DGRAM)
s.connect((test_ip, 1))
res.append(s.getsockname()[0])
except:
except Exception:
pass
try:
res += [ip[4][0] for ip in socket.getaddrinfo(socket.gethostname(), 1)]
except:
except Exception:
pass
res = [re.sub("%.*", "", ip) for ip in res if getIpType(ip) == ip_type and isIp(ip)]