Merge remote-tracking branch 'wessie/master'

dejavu/cursor.py

@@ -2,8 +2,8 @@ from __future__ import unicode_literals
 from __future__ import absolute_import
 import Queue
 
-import pymysql
-import pymysql.cursors
+import MySQLdb as mysql
+import MySQLdb.cursors
 
 
 def cursor_factory(**factory_options):
@@ -26,18 +26,18 @@ class Cursor(object):
     """
     _cache = Queue.Queue(maxsize=5)
 
-    def __init__(self, cursor_type=pymysql.cursors.DictCursor, **options):
+    def __init__(self, cursor_type=mysql.cursors.DictCursor, **options):
         super(Cursor, self).__init__()
 
         try:
             conn = self._cache.get_nowait()
         except Queue.Empty:
-            conn = pymysql.connect(**options)
+            conn = mysql.connect(**options)
 
         self.conn = conn
         self.cursor_type = cursor_type
 
-    def __enter__(self):
+    def __enter__(slf):
         self.cursor = self.conn.cursor(self.cursor_type)
         return self.cursor
 

dejavu/database.py

@@ -1,6 +1,8 @@
 from __future__ import absolute_import
 from binascii import unhexlify
 
+from MySQLdb.cursors import Cursor
+
 class Database(object):
     def __init__(self):
         super(Database, self).__init__()
@@ -274,14 +276,13 @@ class SQLDatabase(Database):
 
     def return_matches(self, hashes):
         """
-            Return the (song_id, offset_diff) tuples associated with
-            a list of
+        Return the (song_id, offset_diff) tuples associated with
+        a list of
 
-                sha1 => (None, sample_offset)
+            sha1 => (None, sample_offset)
 
-            values.
+        values.
         """
-        from pymysql.cursors import Cursor
         # Create a dictionary of hash => offset pairs for later lookups
         mapper = {}
         for hash, (_, offset) in hashes: