[gnue] r7345 - in trunk/gnue-common/src/datasources/drivers: Base DBSIG2

[reinhard]

Author: reinhard
Date: 2005-04-12 03:54:42 -0500 (Tue, 12 Apr 2005)
New Revision: 7345

Modified:
   trunk/gnue-common/src/datasources/drivers/Base/Connection.py
   trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
Log:
Moved encoding to DBSIG2 driver, as other drivers don't use that parameter.
Changed default encoding to utf-8, which seems to be the safest default.


Modified: trunk/gnue-common/src/datasources/drivers/Base/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/Connection.py        
2005-04-12 08:42:22 UTC (rev 7344)
+++ trunk/gnue-common/src/datasources/drivers/Base/Connection.py        
2005-04-12 08:54:42 UTC (rev 7345)
@@ -74,18 +74,7 @@
     self.name = name
     self.parameters = parameters
 
-    # Text encoding used by the database.
-    # (Not all databases support this concept)
-    try:
-      self._encoding = parameters['encoding']
-    except KeyError:
-      try:
-         self._encoding = gConfig('textEncoding')
-      except:
-        # TODO: Is this a safe default?
-        self._encoding = 'iso8859-1'
 
-
   # ---------------------------------------------------------------------------
   # Define fields necessary for login
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py      
2005-04-12 08:42:22 UTC (rev 7344)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py      
2005-04-12 08:54:42 UTC (rev 7345)
@@ -83,6 +83,12 @@
 
     Base.Connection.__init__ (self, connections, name, parameters)
 
+    # Encoding used to communicate with the database (not used by all drivers)
+    if parameters.has_key ('encoding'):
+      self._encoding = parameters ['encoding']
+    else
+      self._encoding = 'utf-8'
+
     # FIXME: Should be private
     self.native = None