RomanNum3ral
/
scrapy
mirror of https://github.com/scrapy/scrapy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed some obsolete remaining code related to sqlite support in scrapy

This commit is contained in:
Pablo Hoffman 2012-03-16 11:55:55 -03:00
parent 838e1dcce9
commit 35fb01156e
5 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/topics/commands.rst
View File

@ -35,8 +35,6 @@ structure by default, similar to this::
spider1.py spider1.py
spider2.py spider2.py
... ...
.scrapy/
scrapy.db
The directory where the ``scrapy.cfg`` file resides is known as the *project The directory where the ``scrapy.cfg`` file resides is known as the *project
root directory*. That file contains the name of the python module that defines root directory*. That file contains the name of the python module that defines
@ -45,12 +43,6 @@ the project settings. Here is an example::
[settings] [settings]
default = myproject.settings default = myproject.settings
By default, Scrapy projects use a SQLite_ database to store persistent runtime
data of the project, such as the spider queue (the list of spiders that are
scheduled to run). By default, this SQLite database is stored in the *project
data directory* which, by default, is the ``.scrapy`` directory inside the
project root directory mentioned above.
Using the ``scrapy`` tool Using the ``scrapy`` tool
========================= =========================
@ -466,5 +458,3 @@ commands for your Scrapy project.
Example:: Example::
COMMANDS_MODULE = 'mybot.commands' COMMANDS_MODULE = 'mybot.commands'
.. _SQLite: http://en.wikipedia.org/wiki/SQLite

12
docs/topics/settings.rst
View File

@ -883,18 +883,6 @@ Example::
SPIDER_MODULES = ['mybot.spiders_prod', 'mybot.spiders_dev'] SPIDER_MODULES = ['mybot.spiders_prod', 'mybot.spiders_dev']
.. setting:: SQLITE_DB
SQLITE_DB
---------
Default: ``'scrapy.db'``
The location of the project SQLite database, used for storing the spider queue
and other persistent data of the project. If a relative path is given, is taken
relative to the project data dir. For more info see:
:ref:`topics-project-structure`.
.. setting:: STATS_CLASS .. setting:: STATS_CLASS
STATS_CLASS STATS_CLASS

2
scrapy/settings/default_settings.py
View File

@ -214,8 +214,6 @@ SPIDER_MIDDLEWARES_BASE = {
SPIDER_MODULES = [] SPIDER_MODULES = []
SQLITE_DB = 'scrapy.db'
STATS_CLASS = 'scrapy.statscol.MemoryStatsCollector' STATS_CLASS = 'scrapy.statscol.MemoryStatsCollector'
STATS_ENABLED = True STATS_ENABLED = True
STATS_DUMP = True STATS_DUMP = True

2
scrapyd/environ.py
View File

@ -28,8 +28,6 @@ class Environment(object):
env['SCRAPY_JOB'] = message['_job'] env['SCRAPY_JOB'] = message['_job']
if project in self.settings: if project in self.settings:
env['SCRAPY_SETTINGS_MODULE'] = self.settings[project] env['SCRAPY_SETTINGS_MODULE'] = self.settings[project]
dbpath = os.path.join(self.dbs_dir, '%s.db' % project)
env['SCRAPY_SQLITE_DB'] = dbpath
env['SCRAPY_LOG_FILE'] = self._get_file(message, self.logs_dir, 'log') env['SCRAPY_LOG_FILE'] = self._get_file(message, self.logs_dir, 'log')
env['SCRAPY_FEED_URI'] = self._get_file(message, self.items_dir, 'jl') env['SCRAPY_FEED_URI'] = self._get_file(message, self.items_dir, 'jl')
return env return env

1
scrapyd/tests/test_environ.py
View File

@ -29,7 +29,6 @@ class EnvironmentTest(unittest.TestCase):
self.assertEqual(env['SCRAPY_SLOT'], '3') self.assertEqual(env['SCRAPY_SLOT'], '3')
self.assertEqual(env['SCRAPY_SPIDER'], 'myspider') self.assertEqual(env['SCRAPY_SPIDER'], 'myspider')
self.assertEqual(env['SCRAPY_JOB'], 'ID') self.assertEqual(env['SCRAPY_JOB'], 'ID')
self.assert_(env['SCRAPY_SQLITE_DB'].endswith('mybot.db'))
self.assert_(env['SCRAPY_LOG_FILE'].endswith(os.path.join('mybot', 'myspider', 'ID.log'))) self.assert_(env['SCRAPY_LOG_FILE'].endswith(os.path.join('mybot', 'myspider', 'ID.log')))
self.assert_(env['SCRAPY_FEED_URI'].endswith(os.path.join('mybot', 'myspider', 'ID.jl'))) self.assert_(env['SCRAPY_FEED_URI'].endswith(os.path.join('mybot', 'myspider', 'ID.jl')))
self.failIf('SCRAPY_SETTINGS_MODULE' in env) self.failIf('SCRAPY_SETTINGS_MODULE' in env)