From e7ddb2d7b287b5db6f0391bcf9fc4e59a6f67a5f Mon Sep 17 00:00:00 2001
From: piejanssens <pieterjanssens@me.com>
Date: Mon, 11 Aug 2014 20:47:57 +0200
Subject: [PATCH] Resolved conflicts for Begall's db fixes

---
 headphones/db.py | 39 +++++++++++++++++----------------------
 1 file changed, 17 insertions(+), 22 deletions(-)

diff --git a/headphones/db.py b/headphones/db.py
index 576d2533..060b91b1 100644
--- a/headphones/db.py
+++ b/headphones/db.py
@@ -59,37 +59,32 @@ class DBConnection:
             return
 
         sqlResult = None
-        attempt = 0
-
-        while attempt < 5:
-            try:
+        
+        try:
+            with self.connection as c:
                 if args == None:
-                    #logger.debug(self.filename+": "+query)
-                    sqlResult = self.connection.execute(query)
+                    sqlResult = c.execute(query)
                 else:
-                    #logger.debug(self.filename+": "+query+" with args "+str(args))
-                    sqlResult = self.connection.execute(query, args)
-                self.connection.commit()
-                break
-            except sqlite3.OperationalError, e:
-                if "unable to open database file" in e.message or "database is locked" in e.message:
-                    logger.warn('Database Error: %s', e)
-                    attempt += 1
-                    time.sleep(1)
-                else:
-                    logger.error('Database error: %s', e)
-                    raise
-            except sqlite3.DatabaseError, e:
-                logger.error('Fatal Error executing %s :: %s', query, e)
+                    sqlResult = c.execute(query, args)
+                    
+        except sqlite3.OperationalError, e:
+            if "unable to open database file" in e.message or "database is locked" in e.message:
+                logger.warn('Database Error: %s', e)
+            else:
+                logger.error('Database error: %s', e)
                 raise
 
+        except sqlite3.DatabaseError, e:
+            logger.error('Fatal Error executing %s :: %s', query, e)
+            raise
+        
         return sqlResult
 
     def select(self, query, args=None):
 
         sqlResults = self.action(query, args).fetchall()
-
-        if sqlResults == None:
+        
+        if sqlResults == None or sqlResults == [None]:
             return []
 
         return sqlResults