r6119 - in trunk: gnue-appserver/src/gcd gnue-common/src/schema/scripter

[johannes]

Author: johannes
Date: 2004-08-02 03:48:32 -0500 (Mon, 02 Aug 2004)
New Revision: 6119

Modified:
   trunk/gnue-appserver/src/gcd/gcd2sql.py
   trunk/gnue-common/src/schema/scripter/Scripter.py
Log:
Make them compatible to python2.1 again, keeping the unicode-fix


Modified: trunk/gnue-appserver/src/gcd/gcd2sql.py
===================================================================
--- trunk/gnue-appserver/src/gcd/gcd2sql.py     2004-08-01 21:37:26 UTC (rev 
6118)
+++ trunk/gnue-appserver/src/gcd/gcd2sql.py     2004-08-02 08:48:32 UTC (rev 
6119)
@@ -150,7 +150,7 @@
       self.parameters = {}
 
       for item in range (len (self._files)):
-        print u_("Loading gcd file '%s' ...") % self._args [item]
+        print o (u_("Loading gcd file '%s' ...") % self._args [item])
 
         try:
           schema = GCParser.loadFile (self._files [item])
@@ -363,7 +363,7 @@
 
     self.connections.loginToConnection (connection)
 
-    print u_("Updating schema ...")
+    print _("Updating schema ...")
     code = connection.updateSchema (self.tables, self.OPTIONS ['file-only'])
 
     if self.outfile is not None:
@@ -381,7 +381,7 @@
   # ---------------------------------------------------------------------------
 
   def updateRepository (self):
-    print u_("Updating class repository ...")
+    print _("Updating class repository ...")
 
     self._updateModules ()
     self._updateClasses ()
@@ -431,9 +431,9 @@
     if stat [0] + stat [1]:
       self.connections.commitAll ()
 
-    print u_("  Modules   : %(ins)3d inserted, %(upd)3d updated, %(kept)3d "
-            "unchanged.") \
-          % {'ins': stat [0], 'upd': stat [1], 'kept': stat [2]}
+    print o (u_("  Modules   : %(ins)3d inserted, %(upd)3d updated, %(kept)3d "
+                "unchanged.") \
+             % {'ins': stat [0], 'upd': stat [1], 'kept': stat [2]})
 
 
   # ---------------------------------------------------------------------------
@@ -482,9 +482,9 @@
     if stat [0] + stat [1]:
       self.connections.commitAll ()
 
-    print u_("  Classes   : %(ins)3d inserted, %(upd)3d updated, %(kept)3d "
-            "unchanged.") \
-          % {'ins': stat [0], 'upd': stat [1], 'kept': stat [2]}
+    print o (u_("  Classes   : %(ins)3d inserted, %(upd)3d updated, %(kept)3d "
+                "unchanged.") \
+          % {'ins': stat [0], 'upd': stat [1], 'kept': stat [2]})
 
 
   # ---------------------------------------------------------------------------
@@ -539,9 +539,9 @@
     if stat [0] + stat [1]:
       self.connections.commitAll ()
 
-    print u_("  Properties: %(ins)3d inserted, %(upd)3d updated, %(kept)3d "
-            "unchanged.") \
-          % {'ins': stat [0], 'upd': stat [1], 'kept': stat [2]}
+    print o (u_("  Properties: %(ins)3d inserted, %(upd)3d updated, %(kept)3d "
+                "unchanged.") \
+             % {'ins': stat [0], 'upd': stat [1], 'kept': stat [2]})
 
 
   # ---------------------------------------------------------------------------
@@ -592,9 +592,9 @@
     if stat [0] + stat [1]:
       self.connections.commitAll ()
 
-    print u_("  Procedures: %(ins)3d inserted, %(upd)3d updated, %(kept)3d "
-            "unchanged.") \
-          % {'ins': stat [0], 'upd': stat [1], 'kept': stat [2]}
+    print o (u_("  Procedures: %(ins)3d inserted, %(upd)3d updated, %(kept)3d "
+                "unchanged.") \
+              % {'ins': stat [0], 'upd': stat [1], 'kept': stat [2]})
 
 
   # ---------------------------------------------------------------------------
@@ -647,9 +647,9 @@
     if stat [0] + stat [1]:
       self.connections.commitAll ()
 
-    print u_("  Parameters: %(ins)3d inserted, %(upd)3d updated, %(kept)3d "
-            "unchanged.") \
-          % {'ins': stat [0], 'upd': stat [1], 'kept': stat [2]}
+    print o (u_("  Parameters: %(ins)3d inserted, %(upd)3d updated, %(kept)3d "
+                "unchanged.") \
+              % {'ins': stat [0], 'upd': stat [1], 'kept': stat [2]})
 
 
   # ---------------------------------------------------------------------------

Modified: trunk/gnue-common/src/schema/scripter/Scripter.py
===================================================================
--- trunk/gnue-common/src/schema/scripter/Scripter.py   2004-08-01 21:37:26 UTC 
(rev 6118)
+++ trunk/gnue-common/src/schema/scripter/Scripter.py   2004-08-02 08:48:32 UTC 
(rev 6119)
@@ -120,7 +120,7 @@
       self.tabledata = []
 
       for item in range (len (self._files)):
-        print u_("Loading gsd file '%s' ...") % self.ARGUMENTS [item]
+        print o (u_("Loading gsd file '%s' ...") % self.ARGUMENTS [item])
 
         try:
           schema = GSParser.loadFile (self._files [item])
@@ -463,7 +463,7 @@
 
     self.connections.loginToConnection (self.connection)
 
-    print u_("Updating schema ...")
+    print _("Updating schema ...")
     code = self.connection.updateSchema (self.tables,
                                          self.OPTIONS ['file-only'])
     if self.outfile is not None:
@@ -486,7 +486,7 @@
     specified key-fields and updated if it exists otherwise inserted.
     """
 
-    print u_("Updating data ...")
+    print _("Updating data ...")
       
     for table in self.tabledata:
       tablename = table ['name']
@@ -507,7 +507,7 @@
           fields      = fieldList,
           unicodeMode = True)
 
-      print u_("  updating table '%s' ...") % tablename
+      print o (u_("  updating table '%s' ...") % tablename)
       updCount = 0
       insCount = 0
 
@@ -537,8 +537,8 @@
         resultSet.post ()
 
       self.connections.commitAll ()
-      print u_("    Inserted %d row(s), updated %d row(s)") % \
-          (insCount, updCount)
+      print o (u_("    Inserted %d row(s), updated %d row(s)") \
+               % (insCount, updCount))