ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 00:07:14 +03:00
Code Issues Projects Releases Wiki Activity

Renamed ProtocolHandler implementations so not to clash

Browse Source
This commit is contained in:
A_D 2021-01-21 12:01:01 +02:00 committed by Athanasius
parent 52494893e5
commit 4d7ec87746
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
protocol.py
View File

@ -54,7 +54,7 @@ if sys.platform == 'darwin' and getattr(sys, 'frozen', False):
kInternetEventClass = kAEGetURL = struct.unpack('>l', b'GURL')[0]
keyDirectObject = struct.unpack('>l', b'----')[0]
class ProtocolHandler(GenericProtocolHandler):
class DarwinProtocolHandler(GenericProtocolHandler):
POLL = 100 # ms
def start(self, master):
@ -194,7 +194,7 @@ elif sys.platform == 'win32' and getattr(sys, 'frozen', False) and not is_wine a
)
return 0
class ProtocolHandler(GenericProtocolHandler):
class WindowsProtocolHandler(GenericProtocolHandler):
def __init__(self):
GenericProtocolHandler.__init__(self)
@ -273,7 +273,7 @@ else: # Linux / Run from source
from http.server import BaseHTTPRequestHandler, HTTPServer
class ProtocolHandler(GenericProtocolHandler):
class LinuxProtocolHandler(GenericProtocolHandler):
def __init__(self):
GenericProtocolHandler.__init__(self)
@ -342,4 +342,12 @@ else: # Linux / Run from source
# singleton
protocolhandler = ProtocolHandler()
protocolhandler: GenericProtocolHandler
if sys.platform == 'darwin' and getattr(sys, 'frozen', False):
protocolhandler = DarwinProtocolHandler() # pyright: reportUnboundVariable=false
elif sys.platform == 'win32' and getattr(sys, 'frozen', False) and not is_wine:
protocolhandler = WindowsProtocolHandler()
else:
protocolhandler = LinuxProtocolHandler()