From 6960a97ab8f39b978feb4fc578d1b8735bf28c09 Mon Sep 17 00:00:00 2001
From: Milan Stute <mstute@seemoo.tu-darmstadt.de>
Date: Wed, 2 Dec 2020 16:02:38 +0100
Subject: [PATCH] Don't redefine built-in types

---
 opendrop/cli.py    | 8 ++++----
 opendrop/client.py | 8 ++++----
 opendrop/server.py | 1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/opendrop/cli.py b/opendrop/cli.py
index f81bc4c..9434147 100644
--- a/opendrop/cli.py
+++ b/opendrop/cli.py
@@ -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):
diff --git a/opendrop/client.py b/opendrop/client.py
index 0e182c4..471aeff 100644
--- a/opendrop/client.py
+++ b/opendrop/client.py
@@ -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)
diff --git a/opendrop/server.py b/opendrop/server.py
index f6585df..9fe3f80 100644
--- a/opendrop/server.py
+++ b/opendrop/server.py
@@ -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}"
         )