[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-common/src/datasources/drivers DBSIG2/Driv...
|
From: |
Jan Ischebeck |
|
Subject: |
gnue-common/src/datasources/drivers DBSIG2/Driv... |
|
Date: |
Thu, 09 Oct 2003 17:27:51 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue-common
Branch:
Changes by: Jan Ischebeck <address@hidden> 03/10/09 17:27:49
Modified files:
src/datasources/drivers/DBSIG2: Driver.py
src/datasources/drivers/appserver/appserver: Driver.py
src/datasources/drivers/dbf/dbf: Driver.py
src/datasources/drivers/gadfly/gadfly: Driver.py
src/datasources/drivers/mysql/mysql: Driver.py
src/datasources/drivers/odbc/wodbc: Driver.py
src/datasources/drivers/postgresql/popy: Driver.py
src/datasources/drivers/postgresql/pypgsql: Driver.py
Log message:
replaced x.decode(enc) with unicode(x,enc) for python2.1 compatibility
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/DBSIG2/Driver.py.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/appserver/appserver/Driver.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/dbf/dbf/Driver.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/gadfly/gadfly/Driver.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/mysql/mysql/Driver.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/odbc/wodbc/Driver.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/postgresql/popy/Driver.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text
Patches:
Index: gnue-common/src/datasources/drivers/DBSIG2/Driver.py
diff -c gnue-common/src/datasources/drivers/DBSIG2/Driver.py:1.75
gnue-common/src/datasources/drivers/DBSIG2/Driver.py:1.76
*** gnue-common/src/datasources/drivers/DBSIG2/Driver.py:1.75 Wed Oct 8
11:51:48 2003
--- gnue-common/src/datasources/drivers/DBSIG2/Driver.py Thu Oct 9
17:27:48 2003
***************
*** 160,166 ****
dict = {}
for f in (rs):
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f = f.decode(self._dataObject._databaseEncoding)
dict[string.lower(self._fieldNames[i])] = f
i += 1
--- 160,166 ----
dict = {}
for f in (rs):
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f = unicode(f,self._dataObject._databaseEncoding)
dict[string.lower(self._fieldNames[i])] = f
i += 1
Index: gnue-common/src/datasources/drivers/appserver/appserver/Driver.py
diff -c gnue-common/src/datasources/drivers/appserver/appserver/Driver.py:1.19
gnue-common/src/datasources/drivers/appserver/appserver/Driver.py:1.20
*** gnue-common/src/datasources/drivers/appserver/appserver/Driver.py:1.19
Tue Oct 7 17:38:15 2003
--- gnue-common/src/datasources/drivers/appserver/appserver/Driver.py Thu Oct
9 17:27:49 2003
***************
*** 133,139 ****
# convert Strings to unicode
if type(value) == types.StringType:
! value = value.decode('utf-8')
# recode unicode strings to standart encoding
if (type(value) == types.UnicodeType) and \
--- 133,139 ----
# convert Strings to unicode
if type(value) == types.StringType:
! value = unicode(value,'utf-8')
# recode unicode strings to standart encoding
if (type(value) == types.UnicodeType) and \
***************
*** 179,185 ****
value=fieldDict[key]
if type(value) == types.StringType:
if not self._dataCon._unicodeMode:
! fieldDict[key] =
value.decode(gConfig('textEncoding')).encode('utf-8')
else:
fieldDict[key] = value.encode('utf-8')
--- 179,185 ----
value=fieldDict[key]
if type(value) == types.StringType:
if not self._dataCon._unicodeMode:
! fieldDict[key] =
unicode(value,gConfig('textEncoding')).encode('utf-8')
else:
fieldDict[key] = value.encode('utf-8')
Index: gnue-common/src/datasources/drivers/dbf/dbf/Driver.py
diff -c gnue-common/src/datasources/drivers/dbf/dbf/Driver.py:1.9
gnue-common/src/datasources/drivers/dbf/dbf/Driver.py:1.10
*** gnue-common/src/datasources/drivers/dbf/dbf/Driver.py:1.9 Wed Oct 8
11:51:48 2003
--- gnue-common/src/datasources/drivers/dbf/dbf/Driver.py Thu Oct 9
17:27:49 2003
***************
*** 168,174 ****
c=0
for f in self._dataObject._dataConnection.fields:
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f = f.decode(self._dataObject._databaseEncoding)
dict[string.lower(f[0])] = row[c]
c+=1
--- 168,174 ----
c=0
for f in self._dataObject._dataConnection.fields:
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f = unicode(f,self._dataObject._databaseEncoding)
dict[string.lower(f[0])] = row[c]
c+=1
Index: gnue-common/src/datasources/drivers/gadfly/gadfly/Driver.py
diff -c gnue-common/src/datasources/drivers/gadfly/gadfly/Driver.py:1.11
gnue-common/src/datasources/drivers/gadfly/gadfly/Driver.py:1.12
*** gnue-common/src/datasources/drivers/gadfly/gadfly/Driver.py:1.11 Wed Oct
8 11:51:48 2003
--- gnue-common/src/datasources/drivers/gadfly/gadfly/Driver.py Thu Oct 9
17:27:49 2003
***************
*** 78,84 ****
dict = {}
for f in (rs):
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f = f.decode(self._dataObject._databaseEncoding)
dict[string.lower(self._fieldNames[i])] = f
i += 1
--- 78,84 ----
dict = {}
for f in (rs):
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f = unicode(f,self._dataObject._databaseEncoding)
dict[string.lower(self._fieldNames[i])] = f
i += 1
Index: gnue-common/src/datasources/drivers/mysql/mysql/Driver.py
diff -c gnue-common/src/datasources/drivers/mysql/mysql/Driver.py:1.7
gnue-common/src/datasources/drivers/mysql/mysql/Driver.py:1.8
*** gnue-common/src/datasources/drivers/mysql/mysql/Driver.py:1.7 Wed Oct
8 11:51:48 2003
--- gnue-common/src/datasources/drivers/mysql/mysql/Driver.py Thu Oct 9
17:27:49 2003
***************
*** 96,102 ****
dict = {}
for f in (rs):
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f = f.decode(self._dataObject._databaseEncoding)
dict[string.lower(self._fieldNames[i])] = f
i += 1
--- 96,102 ----
dict = {}
for f in (rs):
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f = unicode(f,self._dataObject._databaseEncoding)
dict[string.lower(self._fieldNames[i])] = f
i += 1
Index: gnue-common/src/datasources/drivers/odbc/wodbc/Driver.py
diff -c gnue-common/src/datasources/drivers/odbc/wodbc/Driver.py:1.23
gnue-common/src/datasources/drivers/odbc/wodbc/Driver.py:1.24
*** gnue-common/src/datasources/drivers/odbc/wodbc/Driver.py:1.23 Wed Oct
8 11:51:49 2003
--- gnue-common/src/datasources/drivers/odbc/wodbc/Driver.py Thu Oct 9
17:27:49 2003
***************
*** 208,214 ****
dict = {}
for f in (rs):
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f = f.decode(self._dataObject._databaseEncoding)
dict[self._fieldNames[i]] = f
i = i + 1
--- 208,214 ----
dict = {}
for f in (rs):
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f = unicode(f,self._dataObject._databaseEncoding)
dict[self._fieldNames[i]] = f
i = i + 1
Index: gnue-common/src/datasources/drivers/postgresql/popy/Driver.py
diff -c gnue-common/src/datasources/drivers/postgresql/popy/Driver.py:1.20
gnue-common/src/datasources/drivers/postgresql/popy/Driver.py:1.21
*** gnue-common/src/datasources/drivers/postgresql/popy/Driver.py:1.20 Tue Oct
7 11:20:26 2003
--- gnue-common/src/datasources/drivers/postgresql/popy/Driver.py Thu Oct
9 17:27:49 2003
***************
*** 60,66 ****
dict = {}
for f in (rs):
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f = f.decode(self._dataObject._databaseEncoding)
dict[string.lower(self._fieldNames[i])] = f
i += 1
self._cachedRecords.append (self._recordSetClass(parent=self, \
--- 60,66 ----
dict = {}
for f in (rs):
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f = unicode(f,self._dataObject._databaseEncoding)
dict[string.lower(self._fieldNames[i])] = f
i += 1
self._cachedRecords.append (self._recordSetClass(parent=self, \
Index: gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py
diff -c gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py:1.34
gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py:1.35
*** gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py:1.34
Tue Oct 7 11:20:25 2003
--- gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py Thu Oct
9 17:27:49 2003
***************
*** 71,77 ****
dict = {}
for f in (rs):
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f=f.decode(self._dataObject._databaseEncoding)
dict[string.lower(self._fieldNames[i])] = f
i += 1
self._cachedRecords.append (self._recordSetClass(parent=self, \
--- 71,77 ----
dict = {}
for f in (rs):
if self._dataObject._unicodeMode and type(f)==types.StringType:
! f=unicode(f,self._dataObject._databaseEncoding)
dict[string.lower(self._fieldNames[i])] = f
i += 1
self._cachedRecords.append (self._recordSetClass(parent=self, \
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue-common/src/datasources/drivers DBSIG2/Driv...,
Jan Ischebeck <=