From 08cb3cd3246d3b4a9eb2d241dd2483892b6abbd2 Mon Sep 17 00:00:00 2001
From: Martin Zimmermann <info@posativ.org>
Date: Fri, 25 Jul 2014 17:57:27 +0200
Subject: [PATCH] queue.sqlite -> queue.sa

---
 isso/queue/__init__.py          | 5 ++---
 isso/queue/{sqlite.py => sa.py} | 4 ++--
 isso/tests/test_cache.py        | 3 +--
 isso/tests/test_queue.py        | 5 ++---
 4 files changed, 7 insertions(+), 10 deletions(-)
 rename isso/queue/{sqlite.py => sa.py} (95%)

diff --git a/isso/queue/__init__.py b/isso/queue/__init__.py
index 6fa78fc..3d5626c 100644
--- a/isso/queue/__init__.py
+++ b/isso/queue/__init__.py
@@ -188,7 +188,6 @@ class Worker(threading.Thread):
         time.sleep(f * Worker.interval)
 
 
-from .sqlite import SQLite3Queue
+from .sa import SAQueue
 
-__all__ = ["Full", "Empty", "Retry", "Timeout", "Message", "Queue",
-           "SQLite3Queue"]
+__all__ = ["Full", "Empty", "Retry", "Timeout", "Message", "Queue", "SAQueue"]
diff --git a/isso/queue/sqlite.py b/isso/queue/sa.py
similarity index 95%
rename from isso/queue/sqlite.py
rename to isso/queue/sa.py
index 7d054ad..c72ceea 100644
--- a/isso/queue/sqlite.py
+++ b/isso/queue/sa.py
@@ -16,12 +16,12 @@ pickle = lambda val: json.dumps(val).encode("utf-8")
 unpickle = lambda val: json.loads(val.decode("utf-8"))
 
 
-class SQLite3Queue(Queue):
+class SAQueue(Queue):
     """Implements a shared queue using SQLAlchemy Core
     """
 
     def __init__(self, db, maxlen=-1, timeout=2**10):
-        super(SQLite3Queue, self).__init__(maxlen, timeout)
+        super(SAQueue, self).__init__(maxlen, timeout)
         self.metadata = MetaData()
         self.engine = create_engine(db)
         self.queue = Table("queue", self.metadata,
diff --git a/isso/tests/test_cache.py b/isso/tests/test_cache.py
index 3c71e46..1bc2f12 100644
--- a/isso/tests/test_cache.py
+++ b/isso/tests/test_cache.py
@@ -6,7 +6,6 @@ import unittest
 
 from isso.compat import text_type as str
 
-from isso.db import Adapter
 from isso.cache import Cache, SACache
 
 ns = "test"
@@ -56,4 +55,4 @@ class TestCache(unittest.TestCase):
 class TestSQLite3Cache(TestCache):
 
     def setUp(self):
-        self.cache = SACache(Adapter("sqlite:///:memory:"), threshold=8)
+        self.cache = SACache("sqlite:///:memory:", threshold=8)
diff --git a/isso/tests/test_queue.py b/isso/tests/test_queue.py
index 7d21c48..b209dc3 100644
--- a/isso/tests/test_queue.py
+++ b/isso/tests/test_queue.py
@@ -5,8 +5,7 @@ from __future__ import unicode_literals
 import unittest
 import datetime
 
-from isso.db import SQLite3
-from isso.queue import Message, Queue, Full, Empty, Timeout, SQLite3Queue
+from isso.queue import Message, Queue, Full, Empty, Timeout, SAQueue
 
 
 class TestMessage(unittest.TestCase):
@@ -100,4 +99,4 @@ class TestQueue(unittest.TestCase):
 class TestSQLite3Queue(TestQueue):
 
     def setUp(self):
-        self.cls = lambda *x, **z: SQLite3Queue("sqlite:///:memory:", *x, **z)
+        self.cls = lambda *x, **z: SAQueue("sqlite:///:memory:", *x, **z)