BackTrackZ/scrapy
BackTrackZ/scrapy
1
0
Fork 0
mirror of https://github.com/scrapy/scrapy.git synced 2025-02-25 00:24:31 +00:00
Code Releases Wiki Activity

Fixed banner display in all 3 python shells

Browse Source
This commit is contained in:
Luar Roji 2015-08-21 01:04:19 +01:00
parent 509cc8d41e
commit ee66382f29
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scrapy/shell.py
View File

@ -72,11 +72,12 @@ class Shell(object):
shells += env.strip().lower().split(',')
elif cfg.has_option(section, option):
shells += [cfg.get(section, option).strip().lower()]
else: # try all by default
else: # try all by default
shells += DEFAULT_PYTHON_SHELLS.keys()
# always add standard shell as fallback
shells += ['python']
start_python_console(self.vars, shells=shells)
start_python_console(self.vars, shells=shells,
banner=self.vars.pop('banner', ''))
def _schedule(self, request, spider):
spider = self._open_spider(request, spider)
@ -127,21 +128,25 @@ class Shell(object):
self.vars['shelp'] = self.print_help
self.update_vars(self.vars)
if not self.code:
self.print_help()
self.vars['banner'] = self.get_help()
def print_help(self):
self.p("Available Scrapy objects:")
print(self.get_help())
def get_help(self):
b = []
b.append("Available Scrapy objects:")
for k, v in sorted(self.vars.items()):
if self._is_relevant(v):
self.p(" %-10s %s" % (k, v))
self.p("Useful shortcuts:")
self.p(" shelp() Shell help (print this help)")
b.append(" %-10s %s" % (k, v))
b.append("Useful shortcuts:")
b.append(" shelp() Shell help (print this help)")
if self.inthread:
self.p(" fetch(req_or_url) Fetch request (or URL) and update local objects")
self.p(" view(response) View response in a browser")
b.append(" fetch(req_or_url) Fetch request (or URL) and "
"update local objects")
b.append(" view(response) View response in a browser")
def p(self, line=''):
print("[s] %s" % line)
return "\n".join(["[s] %s" % l for l in b])
def _is_relevant(self, value):
return isinstance(value, self.relevant_classes)
@ -165,6 +170,7 @@ def _request_deferred(request):
"""
request_callback = request.callback
request_errback = request.errback
def _restore_callbacks(result):
request.callback = request_callback
request.errback = request_errback