Merge pull request #1161 from scrapy/telnet-disable

disable scrapy.telnet if twisted.conch is not available
scrapy · Apr 15, 2015 · c013baa · c013baa
2 parents e3aaeb7 + 378b6ef
commit c013baa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/scrapy/telnet.py b/scrapy/telnet.py
@@ -6,9 +6,13 @@
 
 import pprint
 
-from twisted.conch import manhole, telnet
-from twisted.conch.insults import insults
 from twisted.internet import protocol
+try:
+    from twisted.conch import manhole, telnet
+    from twisted.conch.insults import insults
+    TWISTED_CONCH_AVAILABLE = True
+except ImportError:
+    TWISTED_CONCH_AVAILABLE = False
 
 from scrapy.exceptions import NotConfigured
 from scrapy import log, signals
@@ -32,6 +36,8 @@ class TelnetConsole(protocol.ServerFactory):
     def __init__(self, crawler):
         if not crawler.settings.getbool('TELNETCONSOLE_ENABLED'):
             raise NotConfigured
+        if not TWISTED_CONCH_AVAILABLE:
+            raise NotConfigured
         self.crawler = crawler
         self.noisy = False
         self.portrange = [int(x) for x in crawler.settings.getlist('TELNETCONSOLE_PORT')]

diff --git a/tests/py3-ignores.txt b/tests/py3-ignores.txt
@@ -96,5 +96,4 @@ scrapy/contrib/statsmailer.py
 scrapy/contrib/memusage.py
 scrapy/commands/deploy.py
 scrapy/commands/bench.py
-scrapy/telnet.py
 scrapy/mail.py