Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18013
Modified Files:
dbutil.py misc.py
Log Message:
fix unicode/encoding problem with sqlite
Index: dbutil.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/dbutil.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dbutil.py 1 Feb 2004 16:58:34 -0000 1.4
--- dbutil.py 7 Feb 2004 13:07:55 -0000 1.5
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2004/02/07 13:07:55 dischi
+ # fix unicode/encoding problem with sqlite
+ #
# Revision 1.4 2004/02/01 16:58:34 rshortt
# Catch some exceptions probably having to do with bad data.
***************
*** 118,122 ****
# Private Variables
DATABASE = os.path.join(config.FREEVO_CACHEDIR, 'freevo.sqlite')
! self.db = sqlite.connect(DATABASE)
self.cursor = self.db.cursor()
--- 121,125 ----
# Private Variables
DATABASE = os.path.join(config.FREEVO_CACHEDIR, 'freevo.sqlite')
! self.db = sqlite.connect(DATABASE, client_encoding=config.LOCALE)
self.cursor = self.db.cursor()
Index: misc.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/misc.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** misc.py 7 Feb 2004 11:54:29 -0000 1.24
--- misc.py 7 Feb 2004 13:07:55 -0000 1.25
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.25 2004/02/07 13:07:55 dischi
+ # fix unicode/encoding problem with sqlite
+ #
# Revision 1.24 2004/02/07 11:54:29 dischi
# handle html code as unicode
***************
*** 194,202 ****
def escape(sql):
"""
! Escape a SQL query in a manner suitable for sqlite
"""
if sql:
sql = sql.replace('\'','\'\'')
! return sql
else:
return 'null'
--- 197,206 ----
def escape(sql):
"""
! Escape a SQL query in a manner suitable for sqlite. Also convert
! Unicode to normal string object.
"""
if sql:
sql = sql.replace('\'','\'\'')
! return String(sql)
else:
return 'null'
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
