Merge pull request #2138 from whirm/use_the_right_reactor

Import the right reactor

Tribler/Core/Modules/restapi/rest_manager.py

@@ -1,8 +1,10 @@
 import logging
+
+from twisted.internet import reactor
 from twisted.internet.defer import maybeDeferred
 from twisted.web import server
+
 from Tribler.Core.Modules.restapi.root_endpoint import RootEndpoint
-from Tribler.Core.Utilities.twisted_thread import reactor
 from Tribler.dispersy.taskmanager import TaskManager
 
 

Tribler/Core/Modules/versioncheck_manager.py

@@ -1,12 +1,14 @@
 from distutils.version import LooseVersion
 import json
 import logging
+
+from twisted.internet import reactor
 from twisted.internet.error import ConnectError, DNSLookupError
 from twisted.internet.task import LoopingCall
 from twisted.web.client import Agent, readBody
 from twisted.web.error import SchemeNotSupported
 from twisted.web.http_headers import Headers
-from Tribler.Core.Utilities.twisted_thread import reactor
+
 from Tribler.Core.simpledefs import NTFY_INSERT, NTFY_NEW_VERSION
 from Tribler.Core.version import version_id
 from Tribler.dispersy.taskmanager import TaskManager

Tribler/Core/TorrentChecker/session.py

@@ -1,18 +1,17 @@
+from abc import ABCMeta, abstractmethod, abstractproperty
 import logging
 import random
 import struct
 import time
-from abc import ABCMeta, abstractmethod, abstractproperty
-from libtorrent import bdecode
 
-from twisted.internet import defer
+from libtorrent import bdecode
+from twisted.internet import reactor, defer
 from twisted.internet.defer import Deferred, maybeDeferred, DeferredList
 from twisted.internet.protocol import DatagramProtocol
 from twisted.web.client import Agent, readBody, RedirectAgent
 
 from Tribler.Core.Utilities.encoding import add_url_params
 from Tribler.Core.Utilities.tracker_utils import parse_tracker_url
-from Tribler.Core.Utilities.twisted_thread import reactor
 from Tribler.dispersy.util import call_on_reactor_thread
 
 # Although these are the actions for UDP trackers, they can still be used as