[grassyknoll commit] r971 - in branches/unhork: . attic demo grassyknoll/backend grassyknoll/backend/dictionary grassy...
codesite...@google.com
Date: Mon Dec 29 11:36:17 2008
New Revision: 971
Added:
branches/unhork/grassyknoll/collection/backends/
branches/unhork/grassyknoll/collection/backends/__init__.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/__init__.py
branches/unhork/grassyknoll/collection/backends/dictionary/
branches/unhork/grassyknoll/collection/backends/dictionary/DictCollection.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/dictionary/DictCollection.py
branches/unhork/grassyknoll/collection/backends/dictionary/__init__.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/dictionary/__init__.py
branches/unhork/grassyknoll/collection/backends/gdbm/
branches/unhork/grassyknoll/collection/backends/gdbm/GdbmCollection.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/gdbm/GdbmCollection.py
branches/unhork/grassyknoll/collection/backends/gdbm/__init__.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/gdbm/__init__.py
branches/unhork/grassyknoll/collection/backends/lucene/
branches/unhork/grassyknoll/collection/backends/lucene/HitsWrapper.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/lucene/HitsWrapper.py
branches/unhork/grassyknoll/collection/backends/lucene/LuceneCollection.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/lucene/LuceneCollection.py
branches/unhork/grassyknoll/collection/backends/lucene/LuceneConstants.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/lucene/LuceneConstants.py
branches/unhork/grassyknoll/collection/backends/lucene/OneOfQuery.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/lucene/OneOfQuery.py
branches/unhork/grassyknoll/collection/backends/lucene/Smarts.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/lucene/Smarts.py
branches/unhork/grassyknoll/collection/backends/lucene/TermIterator.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/lucene/TermIterator.py
branches/unhork/grassyknoll/collection/backends/lucene/__init__.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/lucene/__init__.py
branches/unhork/grassyknoll/collection/backends/lucene/conversion.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/lucene/conversion.py
branches/unhork/grassyknoll/collection/backends/memcached/
branches/unhork/grassyknoll/collection/backends/memcached/MemcachedCollection.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/memcached/MemcachedCollection.py
branches/unhork/grassyknoll/collection/backends/memcached/__init__.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/memcached/__init__.py
branches/unhork/grassyknoll/collection/backends/sql/
branches/unhork/grassyknoll/collection/backends/sql/MysqlCollection.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/sql/MysqlCollection.py
branches/unhork/grassyknoll/collection/backends/sql/PostgresqlCollection.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/sql/PostgresqlCollection.py
branches/unhork/grassyknoll/collection/backends/sql/SqlCollection.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/sql/SqlCollection.py
branches/unhork/grassyknoll/collection/backends/sql/SqliteCollection.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/sql/SqliteCollection.py
branches/unhork/grassyknoll/collection/backends/sql/TableMaker.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/sql/TableMaker.py
branches/unhork/grassyknoll/collection/backends/sql/__init__.py
- copied, changed from r970,
/branches/unhork/grassyknoll/backend/sql/__init__.py
Removed:
branches/unhork/grassyknoll/backend/__init__.py
branches/unhork/grassyknoll/backend/dictionary/DictCollection.py
branches/unhork/grassyknoll/backend/dictionary/__init__.py
branches/unhork/grassyknoll/backend/gdbm/GdbmCollection.py
branches/unhork/grassyknoll/backend/gdbm/__init__.py
branches/unhork/grassyknoll/backend/lucene/HitsWrapper.py
branches/unhork/grassyknoll/backend/lucene/LuceneCollection.py
branches/unhork/grassyknoll/backend/lucene/LuceneConstants.py
branches/unhork/grassyknoll/backend/lucene/OneOfQuery.py
branches/unhork/grassyknoll/backend/lucene/Smarts.py
branches/unhork/grassyknoll/backend/lucene/TermIterator.py
branches/unhork/grassyknoll/backend/lucene/__init__.py
branches/unhork/grassyknoll/backend/lucene/conversion.py
branches/unhork/grassyknoll/backend/memcached/MemcachedCollection.py
branches/unhork/grassyknoll/backend/memcached/__init__.py
branches/unhork/grassyknoll/backend/sql/MysqlCollection.py
branches/unhork/grassyknoll/backend/sql/PostgresqlCollection.py
branches/unhork/grassyknoll/backend/sql/SqlCollection.py
branches/unhork/grassyknoll/backend/sql/SqliteCollection.py
branches/unhork/grassyknoll/backend/sql/TableMaker.py
branches/unhork/grassyknoll/backend/sql/__init__.py
Modified:
branches/unhork/attic/test_MetakitCollection.py
branches/unhork/demo/dict_config.py
branches/unhork/demo/gdbm_config.py
branches/unhork/demo/lucene_config.py
branches/unhork/demo/memcached_config.py
branches/unhork/demo/sqlite_config.py
branches/unhork/grassyknoll/tests/test_HitsWrapper.py
branches/unhork/grassyknoll/tests/test_Model.py
branches/unhork/grassyknoll/tests/test_OneOfQuery.py
branches/unhork/grassyknoll/tests/test_Smarts.py
branches/unhork/grassyknoll/tests/test_TableMaker.py
branches/unhork/grassyknoll/tests/test_backends/SqlCollectionTests.py
branches/unhork/grassyknoll/tests/test_backends/test_DictCollection.py
branches/unhork/grassyknoll/tests/test_backends/test_GdbmCollection.py
branches/unhork/grassyknoll/tests/test_backends/test_LuceneCollection.py
branches/unhork/grassyknoll/tests/test_backends/test_MysqlCollection.py
branches/unhork/grassyknoll/tests/test_backends/test_PersistentDictCollection.py
branches/unhork/grassyknoll/tests/test_backends/test_PostgresqlCollection.py
branches/unhork/grassyknoll/tests/test_backends/test_SqliteCollection.py
branches/unhork/grassyknoll/tests/test_lucene_conversion.py
branches/unhork/grassyknoll/tests/test_memcached_backend.py
branches/unhork/setup.py
Log:
Issue #162: Moved grassyknoll.backend to grassyknoll.collection.backends.
Modified: branches/unhork/attic/test_MetakitCollection.py
==============================================================================
--- branches/unhork/attic/test_MetakitCollection.py (original)
+++ branches/unhork/attic/test_MetakitCollection.py Mon Dec 29 11:36:17 2008
@@ -1,5 +1,5 @@
try:
- from grassyknoll.backend.metakit.MetakitCollection import
MetakitCollection
+ from grassyknoll.collection.backends.metakit.MetakitCollection import
MetakitCollection
except ImportError: # Metakit isn't available.
from nose.exc import SkipTest
raise SkipTest('Could not import metakit.')
Modified: branches/unhork/demo/dict_config.py
==============================================================================
--- branches/unhork/demo/dict_config.py (original)
+++ branches/unhork/demo/dict_config.py Mon Dec 29 11:36:17 2008
@@ -10,7 +10,7 @@
INPUT_NORMAN = nsf.NSFNorman
## COLLECTION: a grassyknoll.collection.Collection to use
-from grassyknoll.backend.dictionary import DictCollection
+from grassyknoll.collection.backends.dictionary import DictCollection
# uncomment the following for an in-memory, non-persistent DictCollection.
#COLLECTION=DictCollection.DictCollection()
Modified: branches/unhork/demo/gdbm_config.py
==============================================================================
--- branches/unhork/demo/gdbm_config.py (original)
+++ branches/unhork/demo/gdbm_config.py Mon Dec 29 11:36:17 2008
@@ -9,7 +9,7 @@
INPUT_NORMAN = nsf.NSFNorman
## COLLECTION: a grassyknoll.collection.Collection to use
-from grassyknoll.backend.gdbm.GdbmCollection import GdbmCollection
+from grassyknoll.collection.backends.gdbm.GdbmCollection import
GdbmCollection
COLLECTION=GdbmCollection(db_file)
## HOST and PORT to listen on
Modified: branches/unhork/demo/lucene_config.py
==============================================================================
--- branches/unhork/demo/lucene_config.py (original)
+++ branches/unhork/demo/lucene_config.py Mon Dec 29 11:36:17 2008
@@ -9,7 +9,7 @@
INPUT_NORMAN = nsf.NSFNorman
## COLLECTION: a grassyknoll.collection.Collection to use
-from grassyknoll.backend.lucene.LuceneCollection import LuceneCollection
+from grassyknoll.collection.backends.lucene.LuceneCollection import
LuceneCollection
COLLECTION=LuceneCollection(index_dir, nsf.NSFLuceneNorman, create=True)
Modified: branches/unhork/demo/memcached_config.py
==============================================================================
--- branches/unhork/demo/memcached_config.py (original)
+++ branches/unhork/demo/memcached_config.py Mon Dec 29 11:36:17 2008
@@ -3,13 +3,13 @@
## ROOT_DIR: directory this file was found in. Feel free to ignore
import os.path
-from grassyknoll.backend.memcached.MemcachedCollection import
MemcachedCollection
+from grassyknoll.collection.backends.memcached.MemcachedCollection import
MemcachedCollection
## INPUT_NORMAN: define fields and their datatypes
from grassyknoll.tests import nsf
INPUT_NORMAN = nsf.NSFNorman
## COLLECTION: a grassyknoll.collection.Collection to use
-from grassyknoll.backend.sql.SqliteCollection import SqliteCollection
+from grassyknoll.collection.backends.sql.SqliteCollection import
SqliteCollection
COLLECTION=MemcachedCollection(hosts=['127.0.0.1:11211'],
key_prefix='GrassyKnoll')
## HOST and PORT to listen on
Modified: branches/unhork/demo/sqlite_config.py
==============================================================================
--- branches/unhork/demo/sqlite_config.py (original)
+++ branches/unhork/demo/sqlite_config.py Mon Dec 29 11:36:17 2008
@@ -9,7 +9,7 @@
INPUT_NORMAN = nsf.NSFNorman
## COLLECTION: a grassyknoll.collection.Collection to use
-from grassyknoll.backend.sql.SqliteCollection import SqliteCollection
+from grassyknoll.collection.backends.sql.SqliteCollection import
SqliteCollection
COLLECTION=SqliteCollection(db_file, nsf.NSFTable, create=True)
## HOST and PORT to listen on
Copied: branches/unhork/grassyknoll/collection/backends/__init__.py (from
r970, /branches/unhork/grassyknoll/backend/__init__.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/dictionary/DictCollection.py
(from r970,
/branches/unhork/grassyknoll/backend/dictionary/DictCollection.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/dictionary/__init__.py
(from r970, /branches/unhork/grassyknoll/backend/dictionary/__init__.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/gdbm/GdbmCollection.py
(from r970, /branches/unhork/grassyknoll/backend/gdbm/GdbmCollection.py)
==============================================================================
Copied: branches/unhork/grassyknoll/collection/backends/gdbm/__init__.py
(from r970, /branches/unhork/grassyknoll/backend/gdbm/__init__.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/lucene/HitsWrapper.py (from
r970, /branches/unhork/grassyknoll/backend/lucene/HitsWrapper.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/lucene/LuceneCollection.py
(from r970, /branches/unhork/grassyknoll/backend/lucene/LuceneCollection.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/lucene/LuceneConstants.py
(from r970, /branches/unhork/grassyknoll/backend/lucene/LuceneConstants.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/lucene/OneOfQuery.py (from
r970, /branches/unhork/grassyknoll/backend/lucene/OneOfQuery.py)
==============================================================================
Copied: branches/unhork/grassyknoll/collection/backends/lucene/Smarts.py
(from r970, /branches/unhork/grassyknoll/backend/lucene/Smarts.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/lucene/TermIterator.py
(from r970, /branches/unhork/grassyknoll/backend/lucene/TermIterator.py)
==============================================================================
Copied: branches/unhork/grassyknoll/collection/backends/lucene/__init__.py
(from r970, /branches/unhork/grassyknoll/backend/lucene/__init__.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/lucene/conversion.py (from
r970, /branches/unhork/grassyknoll/backend/lucene/conversion.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/memcached/MemcachedCollection.py
(from r970,
/branches/unhork/grassyknoll/backend/memcached/MemcachedCollection.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/memcached/__init__.py (from
r970, /branches/unhork/grassyknoll/backend/memcached/__init__.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/sql/MysqlCollection.py
(from r970, /branches/unhork/grassyknoll/backend/sql/MysqlCollection.py)
==============================================================================
--- /branches/unhork/grassyknoll/backend/sql/MysqlCollection.py (original)
+++ branches/unhork/grassyknoll/collection/backends/sql/MysqlCollection.py
Mon Dec 29 11:36:17 2008
@@ -6,7 +6,7 @@
import MySQLdb
from SqlCollection import SqlCollection
-import grassyknoll.backend.sql.TableMaker as TableMaker
+import grassyknoll.collection.backends.sql.TableMaker as TableMaker
class MysqlCollection(SqlCollection):
Copied:
branches/unhork/grassyknoll/collection/backends/sql/PostgresqlCollection.py
(from r970,
/branches/unhork/grassyknoll/backend/sql/PostgresqlCollection.py)
==============================================================================
--- /branches/unhork/grassyknoll/backend/sql/PostgresqlCollection.py
(original)
+++
branches/unhork/grassyknoll/collection/backends/sql/PostgresqlCollection.py
Mon Dec 29 11:36:17 2008
@@ -6,7 +6,7 @@
import psycopg2
from SqlCollection import SqlCollection
-import grassyknoll.backend.sql.TableMaker as TableMaker
+import grassyknoll.collection.backends.sql.TableMaker as TableMaker
class PostgresqlCollection(SqlCollection):
Copied:
branches/unhork/grassyknoll/collection/backends/sql/SqlCollection.py (from
r970, /branches/unhork/grassyknoll/backend/sql/SqlCollection.py)
==============================================================================
Copied:
branches/unhork/grassyknoll/collection/backends/sql/SqliteCollection.py
(from r970, /branches/unhork/grassyknoll/backend/sql/SqliteCollection.py)
==============================================================================
--- /branches/unhork/grassyknoll/backend/sql/SqliteCollection.py (original)
+++ branches/unhork/grassyknoll/collection/backends/sql/SqliteCollection.py
Mon Dec 29 11:36:17 2008
@@ -4,7 +4,7 @@
import datetime
from SqlCollection import SqlCollection, tryCommit
-import grassyknoll.backend.sql.TableMaker as TableMaker
+import grassyknoll.collection.backends.sql.TableMaker as TableMaker
from grassyknoll.collection.Collection import FileBasedCollection
def __register_adapters_and_converters():
Copied: branches/unhork/grassyknoll/collection/backends/sql/TableMaker.py
(from r970, /branches/unhork/grassyknoll/backend/sql/TableMaker.py)
==============================================================================
Copied: branches/unhork/grassyknoll/collection/backends/sql/__init__.py
(from r970, /branches/unhork/grassyknoll/backend/sql/__init__.py)
==============================================================================
Modified: branches/unhork/grassyknoll/tests/test_HitsWrapper.py
==============================================================================
--- branches/unhork/grassyknoll/tests/test_HitsWrapper.py (original)
+++ branches/unhork/grassyknoll/tests/test_HitsWrapper.py Mon Dec 29
11:36:17 2008
@@ -1,7 +1,7 @@
"""welcome the land of off-by-one. enjoy your stay!"""
import unittest
-from grassyknoll.backend.lucene.HitsWrapper import HitsWrapper
+from grassyknoll.collection.backends.lucene.HitsWrapper import HitsWrapper
def wrapper(hits):
return HitsWrapper(hits, lambda x: x*10)
Modified: branches/unhork/grassyknoll/tests/test_Model.py
==============================================================================
--- branches/unhork/grassyknoll/tests/test_Model.py (original)
+++ branches/unhork/grassyknoll/tests/test_Model.py Mon Dec 29 11:36:17 2008
@@ -7,8 +7,8 @@
from grassyknoll.lib.Model import Model, Schema, SchemaProxy, Field
from grassyknoll.lib import Norman
-from grassyknoll.backend.sql import TableMaker
-from grassyknoll.backend.lucene import LuceneCollection, Smarts
+from grassyknoll.collection.backends.sql import TableMaker
+from grassyknoll.collection.backends.lucene import LuceneCollection, Smarts
class MyType1(object):
pass
Modified: branches/unhork/grassyknoll/tests/test_OneOfQuery.py
==============================================================================
--- branches/unhork/grassyknoll/tests/test_OneOfQuery.py (original)
+++ branches/unhork/grassyknoll/tests/test_OneOfQuery.py Mon Dec 29
11:36:17 2008
@@ -1,6 +1,6 @@
from grassyknoll.tests import *
-from grassyknoll.backend.lucene.OneOfQuery import OneOfQuery
+from grassyknoll.collection.backends.lucene.OneOfQuery import OneOfQuery
from lucene import (BooleanQuery, Query, TermQuery, Term, NumberTools,
BooleanClause)
Modified: branches/unhork/grassyknoll/tests/test_Smarts.py
==============================================================================
--- branches/unhork/grassyknoll/tests/test_Smarts.py (original)
+++ branches/unhork/grassyknoll/tests/test_Smarts.py Mon Dec 29 11:36:17
2008
@@ -8,7 +8,7 @@
# XXX Copied from test_LuceneCollection.py. I don't like copying code,
but I'm not
# sure how better to do this.
from Factory import ObjectTemplate
-from grassyknoll.backend.lucene.LuceneCollection import (LuceneCollection,
+from grassyknoll.collection.backends.lucene.LuceneCollection import
(LuceneCollection,
LuceneNorman,
SmartFieldNorman)
@@ -24,7 +24,7 @@
# End copying.
from lucene import Hit
-from grassyknoll.backend.lucene.Smarts import (SmartField, SmartDoc,
SmartHit)
+from grassyknoll.collection.backends.lucene.Smarts import (SmartField,
SmartDoc, SmartHit)
class LuceneBaseTest(SimpleLoadBase):
Modified: branches/unhork/grassyknoll/tests/test_TableMaker.py
==============================================================================
--- branches/unhork/grassyknoll/tests/test_TableMaker.py (original)
+++ branches/unhork/grassyknoll/tests/test_TableMaker.py Mon Dec 29
11:36:17 2008
@@ -1,5 +1,5 @@
from grassyknoll.tests import *
-from grassyknoll.backend.sql import TableMaker
+from grassyknoll.collection.backends.sql import TableMaker
def test_columnSQL():
__id__ = TableMaker.Column(str, primary_key=True)
Modified:
branches/unhork/grassyknoll/tests/test_backends/SqlCollectionTests.py
==============================================================================
--- branches/unhork/grassyknoll/tests/test_backends/SqlCollectionTests.py
(original)
+++ branches/unhork/grassyknoll/tests/test_backends/SqlCollectionTests.py
Mon Dec 29 11:36:17 2008
@@ -4,7 +4,7 @@
from grassyknoll.collection.Collection import *
-from grassyknoll.backend.sql import TableMaker
+from grassyknoll.collection.backends.sql import TableMaker
from grassyknoll.tests import *
from grassyknoll.tests.test_backends.GenericCollectionTests import
TestFilenameFactory
Modified:
branches/unhork/grassyknoll/tests/test_backends/test_DictCollection.py
==============================================================================
--- branches/unhork/grassyknoll/tests/test_backends/test_DictCollection.py
(original)
+++ branches/unhork/grassyknoll/tests/test_backends/test_DictCollection.py
Mon Dec 29 11:36:17 2008
@@ -1,5 +1,5 @@
from Factory import Bunch
-from grassyknoll.backend.dictionary.DictCollection import DictCollection
+from grassyknoll.collection.backends.dictionary.DictCollection import
DictCollection
import SimpleCollectionTests
SimpleCollectionTests.makeTestClasses(DictCollection, Bunch(), globals())
Modified:
branches/unhork/grassyknoll/tests/test_backends/test_GdbmCollection.py
==============================================================================
--- branches/unhork/grassyknoll/tests/test_backends/test_GdbmCollection.py
(original)
+++ branches/unhork/grassyknoll/tests/test_backends/test_GdbmCollection.py
Mon Dec 29 11:36:17 2008
@@ -1,5 +1,5 @@
from Factory import ObjectTemplate
-from grassyknoll.backend.gdbm.GdbmCollection import GdbmCollection
+from grassyknoll.collection.backends.gdbm.GdbmCollection import
GdbmCollection
from grassyknoll.tests.test_backends.GenericCollectionTests import
TestFilenameFactory
location = ObjectTemplate(path=TestFilenameFactory)
Modified:
branches/unhork/grassyknoll/tests/test_backends/test_LuceneCollection.py
==============================================================================
---
branches/unhork/grassyknoll/tests/test_backends/test_LuceneCollection.py
(original)
+++
branches/unhork/grassyknoll/tests/test_backends/test_LuceneCollection.py
Mon Dec 29 11:36:17 2008
@@ -6,7 +6,7 @@
from Factory import ObjectTemplate, Bunch
from grassyknoll.lib.Norman import Object, Unicode
from grassyknoll.tests.test_backends.GenericCollectionTests import
TestFilenameFactory
-from grassyknoll.backend.lucene.LuceneCollection import (LuceneCollection,
+from grassyknoll.collection.backends.lucene.LuceneCollection import
(LuceneCollection,
LuceneNorman,
SmartFieldNorman)
Modified:
branches/unhork/grassyknoll/tests/test_backends/test_MysqlCollection.py
==============================================================================
--- branches/unhork/grassyknoll/tests/test_backends/test_MysqlCollection.py
(original)
+++ branches/unhork/grassyknoll/tests/test_backends/test_MysqlCollection.py
Mon Dec 29 11:36:17 2008
@@ -11,5 +11,5 @@
db = os.environ.get('GK_TEST_MYSQL_DB')
if user and db:
- from grassyknoll.backend.sql.MysqlCollection import MysqlCollection
+ from grassyknoll.collection.backends.sql.MysqlCollection import
MysqlCollection
makeTestClasses(MysqlCollection, globals(), user=user, passwd=passwd,
db=db)
Modified:
branches/unhork/grassyknoll/tests/test_backends/test_PersistentDictCollection.py
==============================================================================
---
branches/unhork/grassyknoll/tests/test_backends/test_PersistentDictCollection.py
(original)
+++
branches/unhork/grassyknoll/tests/test_backends/test_PersistentDictCollection.py
Mon Dec 29 11:36:17 2008
@@ -1,5 +1,5 @@
from Factory import ObjectTemplate
-from grassyknoll.backend.dictionary.DictCollection import
PersistentDictCollection
+from grassyknoll.collection.backends.dictionary.DictCollection import
PersistentDictCollection
from grassyknoll.tests.test_backends.GenericCollectionTests import
TestFilenameFactory
location = ObjectTemplate(path=TestFilenameFactory)
Modified:
branches/unhork/grassyknoll/tests/test_backends/test_PostgresqlCollection.py
==============================================================================
---
branches/unhork/grassyknoll/tests/test_backends/test_PostgresqlCollection.py
(original)
+++
branches/unhork/grassyknoll/tests/test_backends/test_PostgresqlCollection.py
Mon Dec 29 11:36:17 2008
@@ -11,5 +11,5 @@
db = os.environ.get('GK_TEST_PGSQL_DB')
if user and db:
- from grassyknoll.backend.sql.PostgresqlCollection import
PostgresqlCollection
+ from grassyknoll.collection.backends.sql.PostgresqlCollection import
PostgresqlCollection
makeTestClasses(PostgresqlCollection, globals(), user=user,
passwd=passwd, db=db)
Modified:
branches/unhork/grassyknoll/tests/test_backends/test_SqliteCollection.py
==============================================================================
---
branches/unhork/grassyknoll/tests/test_backends/test_SqliteCollection.py
(original)
+++
branches/unhork/grassyknoll/tests/test_backends/test_SqliteCollection.py
Mon Dec 29 11:36:17 2008
@@ -2,7 +2,7 @@
from grassyknoll.tests.test_backends.SqlCollectionTests import
makeTestClasses
from grassyknoll.tests.test_backends.GenericCollectionTests import
TestFilenameFactory
-from grassyknoll.backend.sql.SqliteCollection import SqliteCollection
+from grassyknoll.collection.backends.sql.SqliteCollection import
SqliteCollection
makeTestClasses(SqliteCollection, globals(), path=TestFilenameFactory)
# Commented out for speed concerns; it doubles the time it takes to run
these tests. Uncomment
Modified: branches/unhork/grassyknoll/tests/test_lucene_conversion.py
==============================================================================
--- branches/unhork/grassyknoll/tests/test_lucene_conversion.py (original)
+++ branches/unhork/grassyknoll/tests/test_lucene_conversion.py Mon Dec 29
11:36:17 2008
@@ -1,4 +1,4 @@
-from grassyknoll.backend.lucene.conversion import toLucene, fromLucene
+from grassyknoll.collection.backends.lucene.conversion import toLucene,
fromLucene
import unittest
import datetime
Modified: branches/unhork/grassyknoll/tests/test_memcached_backend.py
==============================================================================
--- branches/unhork/grassyknoll/tests/test_memcached_backend.py (original)
+++ branches/unhork/grassyknoll/tests/test_memcached_backend.py Mon Dec 29
11:36:17 2008
@@ -2,7 +2,7 @@
### requires the demon to be running, so we have a separate test file for
### the Memcached backend.
-from grassyknoll.backend.memcached.MemcachedCollection import
MemcachedCollection
+from grassyknoll.collection.backends.memcached.MemcachedCollection import
MemcachedCollection
from grassyknoll.collection.Collection import *
from Factory import Bunch
from nose.exc import SkipTest
Modified: branches/unhork/setup.py
==============================================================================
--- branches/unhork/setup.py (original)
+++ branches/unhork/setup.py Mon Dec 29 11:36:17 2008
@@ -53,10 +53,10 @@
],
packages=[
'grassyknoll',
- 'grassyknoll.backend',
- 'grassyknoll.backend.dictionary',
- 'grassyknoll.backend.sql',
- 'grassyknoll.backend.lucene',
+ 'grassyknoll.collection.backends',
+ 'grassyknoll.collection.backends.dictionary',
+ 'grassyknoll.collection.backends.sql',
+ 'grassyknoll.collection.backends.lucene',
'grassyknoll.client',
'grassyknoll.collection',
'grassyknoll.compat',