changeset 385e65dabb82 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=385e65dabb82 description: don't try to import pysqlite2, we depend on sqlite3

diffstat:

src/common/check_paths.py | 9 +-------- src/common/exceptions.py | 11 ----------- src/common/logger.py | 8 +------- src/common/optparser.py | 9 +-------- src/history_manager.py | 8 +------- 5 files changed, 4 insertions(+), 41 deletions(-)

diffs (99 lines):

diff -r 41a7e43261c0 -r 385e65dabb82 src/common/check_paths.py --- a/src/common/check_paths.py Mon Nov 30 14:32:59 2009 +0100 +++ b/src/common/check_paths.py Mon Nov 30 16:36:47 2009 +0100 @@ -27,18 +27,11 @@ import sys import stat

-import exceptions from common import gajim import logger

# DO NOT MOVE ABOVE OF import gajim -try: - import sqlite3 as sqlite # python 2.5 -except ImportError: - try: - from pysqlite2 import dbapi2 as sqlite - except ImportError: - raise exceptions.PysqliteNotAvailable +import sqlite3 as sqlite

def create_log_db(): print _('creating logs database') diff -r 41a7e43261c0 -r 385e65dabb82 src/common/exceptions.py --- a/src/common/exceptions.py Mon Nov 30 14:32:59 2009 +0100 +++ b/src/common/exceptions.py Mon Nov 30 16:36:47 2009 +0100 @@ -21,17 +21,6 @@ ## along with Gajim. If not, see http://www.gnu.org/licenses/. ##

-class PysqliteNotAvailable(Exception): - """ - Sqlite2 is not installed or python bindings are missing - """ - - def __init__(self): - Exception.__init__(self) - - def __str__(self): - return _('pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting...') - class PysqliteOperationalError(Exception): """ Sqlite2 raised pysqlite2.dbapi2.OperationalError diff -r 41a7e43261c0 -r 385e65dabb82 src/common/logger.py --- a/src/common/logger.py Mon Nov 30 14:32:59 2009 +0100 +++ b/src/common/logger.py Mon Nov 30 16:36:47 2009 +0100 @@ -38,13 +38,7 @@ import exceptions import gajim

-try: - import sqlite3 as sqlite # python 2.5 -except ImportError: - try: - from pysqlite2 import dbapi2 as sqlite - except ImportError: - raise exceptions.PysqliteNotAvailable +import sqlite3 as sqlite

import configpaths LOG_DB_PATH = configpaths.gajimpaths['LOG_DB'] diff -r 41a7e43261c0 -r 385e65dabb82 src/common/optparser.py --- a/src/common/optparser.py Mon Nov 30 14:32:59 2009 +0100 +++ b/src/common/optparser.py Mon Nov 30 16:36:47 2009 +0100 @@ -34,14 +34,7 @@ from common import helpers from common import caps

-import exceptions -try: - import sqlite3 as sqlite # python 2.5 -except ImportError: - try: - from pysqlite2 import dbapi2 as sqlite - except ImportError: - raise exceptions.PysqliteNotAvailable +import sqlite3 as sqlite import logger

class OptionsParser: diff -r 41a7e43261c0 -r 385e65dabb82 src/history_manager.py --- a/src/history_manager.py Mon Nov 30 14:32:59 2009 +0100 +++ b/src/history_manager.py Mon Nov 30 16:36:47 2009 +0100 @@ -102,13 +102,7 @@ ) = range(2, 6)

-try: - import sqlite3 as sqlite # python 2.5 -except ImportError: - try: - from pysqlite2 import dbapi2 as sqlite - except ImportError: - raise exceptions.PysqliteNotAvailable +import sqlite3 as sqlite

class HistoryManager: