Drop custom zeroconf package (fixes #14)

seemoo-lab · Dec 17, 2019 · bc724b3 · bc724b3
1 parent 55feaed
commit bc724b3
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3,059 deletions.
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -102,6 +102,4 @@ OpenDrop is the result of a research project and, thus, has several limitations
 
 ## License
 
-OpenDrop is licensed under the **GNU General Public License v3.0**.
-We use a modified version of the [`python-zeroconf`](https://pypi.org/project/zeroconf/) package (essentially adding rudimentary IPv6 and AWDL support) which is licensed under the **GNU Lesser General Public License v2.1**.
-Both licenses are found in the `LICENSE` file.
+OpenDrop is licensed under the [**GNU General Public License v3.0**](LICENSE).
diff --git a/opendrop/client.py b/opendrop/client.py
@@ -30,7 +30,7 @@
 import libarchive
 
 from .util import AirDropUtil, AbsArchiveWrite
-from .zeroconf import ServiceBrowser, Zeroconf, IPVersion
+from zeroconf import ServiceBrowser, Zeroconf, IPVersion
 
 logger = logging.getLogger(__name__)
 

diff --git a/opendrop/server.py b/opendrop/server.py
@@ -30,7 +30,7 @@
 import libarchive.read
 
 from .util import AirDropUtil
-from .zeroconf import Zeroconf, ServiceInfo, IPVersion
+from zeroconf import Zeroconf, ServiceInfo, IPVersion
 
 logger = logging.getLogger(__name__)