Scrapy, a fast high-level web crawling & scraping framework for Python.
Move telnetconsole settings defaults to scrapy defaults
Daniel Grañaeb64214c8a00
diff --git a/scrapy/extensions/telnet.py b/scrapy/extensions/telnet.pyindex 5e9fce7c5..93342f225 100644--- a/scrapy/extensions/telnet.py+++ b/scrapy/extensions/telnet.py@@ -50,8 +50,8 @@ class TelnetConsole(protocol.ServerFactory):self.noisy = Falseself.portrange = [int(x) for x in crawler.settings.getlist('TELNETCONSOLE_PORT')]self.host = crawler.settings['TELNETCONSOLE_HOST']- self.username = crawler.settings.get('TELNETCONSOLE_USERNAME', 'scrapy')- self.password = crawler.settings.get('TELNETCONSOLE_PASSWORD', 'scrapy')+ self.username = crawler.settings['TELNETCONSOLE_USERNAME']+ self.password = crawler.settings['TELNETCONSOLE_PASSWORD']self.crawler.signals.connect(self.start_listening, signals.engine_started)self.crawler.signals.connect(self.stop_listening, signals.engine_stopped)diff --git a/scrapy/settings/default_settings.py b/scrapy/settings/default_settings.pyindex ca004aedd..2b7bc173c 100644--- a/scrapy/settings/default_settings.py+++ b/scrapy/settings/default_settings.py@@ -277,6 +277,8 @@ USER_AGENT = 'Scrapy/%s (+https://scrapy.org)' % import_module('scrapy').__versiTELNETCONSOLE_ENABLED = 1TELNETCONSOLE_PORT = [6023, 6073]TELNETCONSOLE_HOST = '127.0.0.1'+TELNETCONSOLE_USERNAME = 'scrapy'+TELNETCONSOLE_PASSWORD = 'scrapy'SPIDER_CONTRACTS = {}SPIDER_CONTRACTS_BASE = {