Merge pull request #2248 from redapple/scrapy-shell-import-scrapy

[MRG+1] Make scrapy available in shell without explicit import statement

scrapy/shell.py

@@ -115,6 +115,9 @@ class Shell(object):
         self.populate_vars(response, request, spider)
 
     def populate_vars(self, response=None, request=None, spider=None):
+        import scrapy
+
+        self.vars['scrapy'] = scrapy
         self.vars['crawler'] = self.crawler
         self.vars['item'] = self.item_class()
         self.vars['settings'] = self.crawler.settings
@@ -136,6 +139,7 @@ class Shell(object):
     def get_help(self):
         b = []
         b.append("Available Scrapy objects:")
+        b.append("  scrapy     scrapy module (contains scrapy.Request, scrapy.Selector, etc)")
         for k, v in sorted(self.vars.items()):
             if self._is_relevant(v):
                 b.append("  %-10s %s" % (k, v))

tests/test_command_shell.py

@@ -56,6 +56,13 @@ class ShellTest(ProcessTest, SiteTest, unittest.TestCase):
         errcode, out, _ = yield self.execute(['-c', code.format(url)])
         self.assertEqual(errcode, 0, out)
 
+    @defer.inlineCallbacks
+    def test_scrapy_import(self):
+        url = self.url('/text')
+        code = "fetch(scrapy.Request('{0}'))"
+        errcode, out, _ = yield self.execute(['-c', code.format(url)])
+        self.assertEqual(errcode, 0, out)
+
     @defer.inlineCallbacks
     def test_local_file(self):
         filepath = join(tests_datadir, 'test_site/index.html')