copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

import once sqlite and logger and exceptsion in optparser.py

This commit is contained in:
Nikos Kouremenos 2006-10-11 22:45:33 +00:00
parent 28aee13699
commit 47d557fc1b
1 changed files with 14 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/common/optparser.py
View File

@ -1,16 +1,6 @@
## ##
## Contributors for this file: ## Copyright (C) 2005-2006 Yann Le Boulanger <asterix@lagaule.org>
## - Yann Le Boulanger <asterix@lagaule.org> ## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com>
## - Nikos Kouremenos <kourem@gmail.com>
##
## Copyright (C) 2003-2004 Yann Le Boulanger <asterix@lagaule.org>
## Vincent Hanquez <tab@snarc.org>
## Copyright (C) 2005 Yann Le Boulanger <asterix@lagaule.org>
## Vincent Hanquez <tab@snarc.org>
## Nikos Kouremenos <kourem@gmail.com>
## Dimitur Kirov <dkirov@gmail.com>
## Travis Shirk <travis@pobox.com>
## Norman Rasmussen <norman@rasmussen.co.za>
## ##
## This program is free software; you can redistribute it and/or modify ## This program is free software; you can redistribute it and/or modify
## it under the terms of the GNU General Public License as published ## it under the terms of the GNU General Public License as published
@ -27,11 +17,21 @@ import sys
import locale import locale
from common import gajim from common import gajim
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 logger
class OptionsParser: class OptionsParser:
def __init__(self, filename): def __init__(self, filename):
self.__filename = filename self.__filename = filename
self.old_values = {} # values that are saved in the file and maybe self.old_values = {} # values that are saved in the file and maybe
# no longer valid # no longer valid
def read_line(self, line): def read_line(self, line):
index = line.find(' = ') index = line.find(' = ')
@ -205,16 +205,6 @@ class OptionsParser:
def assert_unread_msgs_table_exists(self): def assert_unread_msgs_table_exists(self):
'''create table unread_messages if there is no such table''' '''create table unread_messages if there is no such table'''
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 logger
con = sqlite.connect(logger.LOG_DB_PATH) con = sqlite.connect(logger.LOG_DB_PATH)
cur = con.cursor() cur = con.cursor()
try: try:
@ -284,16 +274,6 @@ class OptionsParser:
def update_config_to_01013(self): def update_config_to_01013(self):
'''create table transports_cache if there is no such table''' '''create table transports_cache if there is no such table'''
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 logger
con = sqlite.connect(logger.LOG_DB_PATH) con = sqlite.connect(logger.LOG_DB_PATH)
cur = con.cursor() cur = con.cursor()
try: try:
@ -313,15 +293,6 @@ class OptionsParser:
def update_config_to_01014(self): def update_config_to_01014(self):
'''apply indeces to the logs database''' '''apply indeces to the logs database'''
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 logger
print _('migrating logs database to indeces') print _('migrating logs database to indeces')
con = sqlite.connect(logger.LOG_DB_PATH) con = sqlite.connect(logger.LOG_DB_PATH)
cur = con.cursor() cur = con.cursor()
@ -342,14 +313,6 @@ class OptionsParser:
def update_config_to_01015(self): def update_config_to_01015(self):
'''clean show values in logs database''' '''clean show values in logs database'''
try:
import sqlite3 as sqlite # python 2.5
except ImportError:
try:
from pysqlite2 import dbapi2 as sqlite
except ImportError:
raise exceptions.PysqliteNotAvailable
import logger
con = sqlite.connect(logger.LOG_DB_PATH) con = sqlite.connect(logger.LOG_DB_PATH)
cur = con.cursor() cur = con.cursor()
status = dict((i[5:].lower(), logger.constants.__dict__[i]) for i in \ status = dict((i[5:].lower(), logger.constants.__dict__[i]) for i in \