Tribler · ichorid · Nov 14, 2018 · Jan 2, 2019 · Jan 8, 2019 · Jan 9, 2019
diff --git a/.coveragerc b/.coveragerc
@@ -1,4 +1,3 @@
 # .coveragerc to control coverage.py
 [run]
 branch = True
-omit = Tribler/dispersy/*
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "Tribler/dispersy"]
-	path = Tribler/dispersy
-	url = https://github.com/Tribler/dispersy.git
 [submodule "py-ipv8"]
 	path = Tribler/pyipv8
 	url = https://github.com/Tribler/py-ipv8.git
diff --git a/.pylintrc b/.pylintrc
@@ -9,7 +9,7 @@
 
 # Add files or directories to the blacklist. They should be base names, not
 # paths.
-ignore=.git,dispersy,libnacl,data
+ignore=.git,libnacl,data
 
 # Pickle collected data for later comparisons.
 persistent=yes
@@ -150,7 +150,7 @@ generated-members=
 # sudo apt install aspell-en
 
 # List of comma separated words that should not be checked.
-spelling-ignore-words=Tribler,dispersy
+spelling-ignore-words=Tribler
 
 # A path to a file that contains private dictionary; one word per line.
 spelling-private-dict-file=

diff --git a/Tribler/Core/APIImplementation/IPv8EndpointAdapter.py b/Tribler/Core/APIImplementation/IPv8EndpointAdapter.py
diff --git a/Tribler/Core/APIImplementation/IPv8Module.py b/Tribler/Core/APIImplementation/IPv8Module.py