mirror of
https://github.com/Arrowar/StreamingCommunity.git
synced 2025-07-19 00:20:00 +00:00
Fix merge conflicts
This commit is contained in:
parent
e86c476582
commit
675111fd0c
@ -341,14 +341,6 @@ class InternManager():
|
|||||||
except (socket.gaierror, socket.error):
|
except (socket.gaierror, socket.error):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
try:
|
|
||||||
resolver = dns.resolver.Resolver()
|
|
||||||
# Simple DNS resolution test - will raise an exception if it fails
|
|
||||||
resolver.resolve("github.com")
|
|
||||||
return True
|
|
||||||
except Exception:
|
|
||||||
return False
|
|
||||||
|
|
||||||
class OsSummary:
|
class OsSummary:
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.ffmpeg_path = None
|
self.ffmpeg_path = None
|
||||||
|
Loading…
x
Reference in New Issue
Block a user