Changeset 4215:aa1b0927dd45

Timestamp:

04/16/07 14:09:23 (6 years ago)

Author:

Yi Qiang <yqiang@…>

Branch:

default

Message:

Use sqlite3.OptimizedUnciode? as the default text factory everywhere.

Location:

sage/dsage

Files:

• database/clientdb.py (modified) (2 diffs)
• database/jobdb.py (modified) (1 diff)
• database/monitordb.py (modified) (2 diffs)
• dsage.py (modified) (1 diff)

sage/dsage/database/clientdb.py

@@ -20 +20 @@
 import datetime
 import os
-import sqlite3 as sqlite
+import sqlite3
 
 from twisted.python import log
@@ -67 +67 @@
                 if not os.path.isdir(dir):
                     os.mkdir(dir)
-        self.con = sqlite.connect(self.db_file,
-                    detect_types=sqlite.PARSE_DECLTYPES|sqlite.PARSE_COLNAMES)
-        self.con.text_factory = str
+        self.con = sqlite3.connect(self.db_file,
+                    detect_types=sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES)
+        self.con.text_factory = sqlite3.OptimizedUnicode
         
         if sql_functions.table_exists(self.con, self.tablename) is None:

sage/dsage/database/jobdb.py

@@ -405 +405 @@
                    self.db_file,
                    detect_types=sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES)
-        self.con.text_factory = str # Don't want unicode objects 
+        self.con.text_factory = sqlite3.OptimizedUnicode # Don't want unicode objects 
         if not sql_functions.table_exists(self.con, self.tablename):
             sql_functions.create_table(self.con,

sage/dsage/database/monitordb.py

@@ -20 +20 @@
 import datetime
 import os
-import sqlite3 as sqlite
+import sqlite3
 
 from twisted.python import log
@@ -67 +67 @@
         self.log_level = self.conf['log_level']
         self.log_file = self.conf['log_file']
-        self.con = sqlite.connect(self.db_file,
-                    detect_types=sqlite.PARSE_DECLTYPES|sqlite.PARSE_COLNAMES)
-        self.con.text_factory = str
+        self.con = sqlite3.connect(self.db_file,
+                    detect_types=sqlite3.PARSE_DECLTYPES|sqlite3.PARSE_COLNAMES)
+        self.con.text_factory = sqlite3.OptimizedUnicode
         
         if sql_functions.table_exists(self.con, self.tablename) is None:

sage/dsage/dsage.py

@@ -151 +151 @@
                        to log to $DOT_SAGE/dsage/worker.log
         """
+        
         cmd = 'dsage_worker.py'
         if blocking: