From patchwork Sun Jan 15 21:03:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [bitbake-devel,2/2] prserv: fix import of sqlite3 Date: Sun, 15 Jan 2012 21:03:53 -0000 From: Martin Jansa X-Patchwork-Id: 19403 Message-Id: <1326661433-26379-2-git-send-email-Martin.Jansa@gmail.com> To: bitbake-devel@lists.openembedded.org * this is used in all other bitbake parts where sqlite3 is used, don't know why it wasn't used here, but it fails e.g. on Gentoo Traceback (most recent call last): File "bin/bitbake", line 39, in from bb import cooker File "lib/bb/cooker.py", line 39, in import prserv.serv File "lib/prserv/serv.py", line 4, in import xmlrpclib,sqlite3 ImportError: No module named sqlite3 Signed-off-by: Martin Jansa --- lib/prserv/serv.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/lib/prserv/serv.py b/lib/prserv/serv.py index a759fa7..fa437f9 100644 --- a/lib/prserv/serv.py +++ b/lib/prserv/serv.py @@ -1,7 +1,12 @@ import os,sys,logging import signal, time, atexit, threading from SimpleXMLRPCServer import SimpleXMLRPCServer, SimpleXMLRPCRequestHandler -import xmlrpclib,sqlite3 +import xmlrpclib + +try: + import sqlite3 +except ImportError: + from pysqlite2 import dbapi2 as sqlite3 import bb.server.xmlrpc import prserv