mirror of
https://github.com/seemoo-lab/opendrop.git
synced 2026-09-14 15:16:11 -04:00
Don't redefine built-in types
This commit is contained in:
+4
-4
@@ -137,7 +137,7 @@ class AirDropCli:
|
||||
except IndexError:
|
||||
logger.warning(f"Ignoring receiver with missing address {info}")
|
||||
return
|
||||
id = info.name.split(".")[0]
|
||||
identifier = info.name.split(".")[0]
|
||||
hostname = info.server
|
||||
port = int(info.port)
|
||||
logger.debug(f"AirDrop service found: {hostname}, {address}:{port}, ID {id}")
|
||||
@@ -162,16 +162,16 @@ class AirDropCli:
|
||||
"name": receiver_name,
|
||||
"address": address,
|
||||
"port": port,
|
||||
"id": id,
|
||||
"id": identifier,
|
||||
"flags": flags,
|
||||
"discoverable": discoverable,
|
||||
}
|
||||
self.lock.acquire()
|
||||
self.discover.append(node_info)
|
||||
if discoverable:
|
||||
logger.info(f"Found index {index} ID {id} name {receiver_name}")
|
||||
logger.info(f"Found index {index} ID {identifier} name {receiver_name}")
|
||||
else:
|
||||
logger.debug(f"Receiver ID {id} is not discoverable")
|
||||
logger.debug(f"Receiver ID {identifier} is not discoverable")
|
||||
self.lock.release()
|
||||
|
||||
def receive(self):
|
||||
|
||||
+4
-4
@@ -73,14 +73,14 @@ class AirDropBrowser:
|
||||
self.browser = None
|
||||
self.zeroconf.close()
|
||||
|
||||
def add_service(self, zeroconf, type, name):
|
||||
info = zeroconf.get_service_info(type, name)
|
||||
def add_service(self, zeroconf, service_type, name):
|
||||
info = zeroconf.get_service_info(service_type, name)
|
||||
logger.debug(f"Add service {name}")
|
||||
if self.callback_add is not None:
|
||||
self.callback_add(info)
|
||||
|
||||
def remove_service(self, zeroconf, type, name):
|
||||
info = zeroconf.get_service_info(type, name)
|
||||
def remove_service(self, zeroconf, service_type, name):
|
||||
info = zeroconf.get_service_info(service_type, name)
|
||||
logger.debug(f"Remove service {name}")
|
||||
if self.callback_remove is not None:
|
||||
self.callback_remove(info)
|
||||
|
||||
@@ -335,6 +335,7 @@ class AirDropServerHandler(BaseHTTPRequestHandler):
|
||||
self.end_headers()
|
||||
|
||||
def log_message(self, format, *args):
|
||||
# pylint: disable=redefined-builtin
|
||||
logger.debug(
|
||||
f"{self.client_address[0]} - - [{self.log_date_time_string()}] {format % args}"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user