From 91b9d89ffd9e687da4a92e33822eec4ac32797ff Mon Sep 17 00:00:00 2001
From: Pablo Hoffman <pablo@pablohoffman.com>
Date: Sat, 27 Aug 2011 01:20:57 -0300
Subject: [PATCH] moved scrapy.utils.sqlite to scrapyd.sqlite

--HG--
rename : scrapy/utils/sqlite.py => scrapyd/sqlite.py
rename : scrapy/tests/test_utils_sqlite.py => scrapyd/tests/test_sqlite.py
---
 scrapy/utils/project.py                       | 21 -------------------
 scrapyd/interfaces.py                         |  3 ---
 scrapyd/spiderqueue.py                        |  7 +------
 {scrapy/utils => scrapyd}/sqlite.py           |  0
 .../tests/test_sqlite.py                      |  2 +-
 5 files changed, 2 insertions(+), 31 deletions(-)
 rename {scrapy/utils => scrapyd}/sqlite.py (100%)
 rename scrapy/tests/test_utils_sqlite.py => scrapyd/tests/test_sqlite.py (98%)

diff --git a/scrapy/utils/project.py b/scrapy/utils/project.py
index 7fe778868..4adde9bfa 100644
--- a/scrapy/utils/project.py
+++ b/scrapy/utils/project.py
@@ -40,24 +40,3 @@ def data_path(path):
     otherwise return the path unmodified
     """
     return path if isabs(path) else join(project_data_dir(), path)
-
-def sqlite_db(path, nonwritable_fallback=True):
-    """Get the SQLite database to use. If path is relative, returns the given
-    path inside the project data dir, otherwise returns the path unmodified. If
-    not inside a project returns :memory: to use an in-memory database.
-
-    If nonwritable_fallback is True, and the path is not writable it issues a
-    warning and returns :memory:
-    """
-    if not inside_project() or path == ':memory:':
-        db = ':memory:'
-    else:
-        try:
-            db = data_path(path)
-        except NotConfigured:
-            db = ':memory:'
-        else:
-            if not is_writable(db) and nonwritable_fallback:
-                warnings.warn("%r is not writable - using in-memory SQLite instead" % db)
-                db = ':memory:'
-    return db
diff --git a/scrapyd/interfaces.py b/scrapyd/interfaces.py
index 018da5d08..bac4aa169 100644
--- a/scrapyd/interfaces.py
+++ b/scrapyd/interfaces.py
@@ -49,9 +49,6 @@ class IPoller(Interface):
 
 class ISpiderQueue(Interface):
 
-    def from_settings(settings):
-        """Class method to instantiate from settings"""
-
     def add(name, **spider_args):
         """Add a spider to the queue given its name a some spider arguments.
 
diff --git a/scrapyd/spiderqueue.py b/scrapyd/spiderqueue.py
index 4f3000b84..672a549ac 100644
--- a/scrapyd/spiderqueue.py
+++ b/scrapyd/spiderqueue.py
@@ -1,8 +1,7 @@
 from zope.interface import implements
 
 from scrapyd.interfaces import ISpiderQueue
-from scrapy.utils.sqlite import JsonSqlitePriorityQueue
-from scrapy.utils.project import sqlite_db
+from scrapyd.sqlite import JsonSqlitePriorityQueue
 
 
 class SqliteSpiderQueue(object):
@@ -12,10 +11,6 @@ class SqliteSpiderQueue(object):
     def __init__(self, database=None, table='spider_queue'):
         self.q = JsonSqlitePriorityQueue(database, table)
 
-    @classmethod
-    def from_settings(cls, settings):
-        return cls(sqlite_db(settings['SQLITE_DB']))
-
     def add(self, name, **spider_args):
         d = spider_args.copy()
         d['name'] = name
diff --git a/scrapy/utils/sqlite.py b/scrapyd/sqlite.py
similarity index 100%
rename from scrapy/utils/sqlite.py
rename to scrapyd/sqlite.py
diff --git a/scrapy/tests/test_utils_sqlite.py b/scrapyd/tests/test_sqlite.py
similarity index 98%
rename from scrapy/tests/test_utils_sqlite.py
rename to scrapyd/tests/test_sqlite.py
index 7ecf6d1d9..d0a4f09ec 100644
--- a/scrapy/tests/test_utils_sqlite.py
+++ b/scrapyd/tests/test_sqlite.py
@@ -3,7 +3,7 @@ from datetime import datetime
 from decimal import Decimal
 
 from scrapy.http import Request
-from scrapy.utils.sqlite import SqlitePriorityQueue, JsonSqlitePriorityQueue, \
+from scrapyd.sqlite import SqlitePriorityQueue, JsonSqlitePriorityQueue, \
     PickleSqlitePriorityQueue, SqliteDict, JsonSqliteDict, PickleSqliteDict