mysqlite.py: improve

1) use a common try/except block for all ops
2) do not display query and args when DB is locked (could be several
   hundreds rows)
3) re-raise non locking-related exceptions (e.g. a wrong sql statement)
4) split executemany rows into chunks of 500 (so the caller doesn't have
   to do it)

mysqlite.py

@@ -1,33 +1,41 @@
 import time, random, sys
-import sqlite3 as lite
+import sqlite3
 
 class mysqlite:
+	def _try_op(self, op, query, args=None, rmin=1.5, rmax=7.0):
+		while 1:
+			try:
+				if query is None:
+					return op()
+				elif args is None:
+					return op(query)
+				else:
+					return op(query, args)
+			except sqlite3.OperationalError as e:
+				if e.message == 'database is locked':
+					print "zzZzzZZ: db is locked (%s)"%self.dbname
+					time.sleep(random.uniform(rmin, rmax))
+					continue
+				else:
+					print '%s\nquery: %s\nargs: %s' % (str(sys.exc_info()), str(query), str(args))
+					raise e
 
-	def execute(self, query, args = None, rmin = 1.5, rmax = 7.0):
+	def execute(self, query, args = None, rmin=1.5, rmax=7.0):
+		return self._try_op(self.cursor.execute, query, args, rmin, rmax)
 
-		while True:
+	def executemany(self, query, args, rmin=1.5, rmax=7.0):
-			try: return self.cursor.execute(query,args) if args else self.cursor.execute(query)
+		while len(args):
-			except:
+			self._try_op(self.cursor.executemany, query, args[:500], rmin, rmax)
-				print '%s\nquery: %s\nargs: %s' % (str(sys.exc_info()), str(query), str(args))
+			args = args[500:]
-				time.sleep(random.uniform(rmin, rmax))
 
-	def executemany(self, query, args, rmin = 1.5, rmax = 7.0):
+	def commit(self, rmin=1.5, rmax=7.0):
-
+		return self._try_op(self.handle.commit, None, None, rmin, rmax)
-		while True:
-			try: return self.cursor.executemany(query,args)
-			except:
-				print '%s\nquery: %s\nargs: %s' % (str(sys.exc_info()), str(query), str(args))
-				time.sleep(random.uniform(rmin, rmax))
-
-	def commit(self, rmin = 1.5, rmax = 7.0):
-		while True:
-			try: return self.handle.commit()
-			except: time.sleep(random.uniform(rmin, rmax))
 
 	def close(self):
 		self.handle.close()
 
 	def __init__(self, database, factory = None):
-		self.handle = lite.connect(database)
+		self.handle = sqlite3.connect(database)
 		if factory: self.handle.text_factory = factory
 		self.cursor = self.handle.cursor()
+		self.dbname = database