r5257 - in trunk/gnue-appserver/src: . classrep language

[johannes]

Author: johannes
Date: 2004-03-08 04:06:17 -0600 (Mon, 08 Mar 2004)
New Revision: 5257

Modified:
   trunk/gnue-appserver/src/classrep/Definition.py
   trunk/gnue-appserver/src/classrep/dtest.py
   trunk/gnue-appserver/src/classrep/mtest.py
   trunk/gnue-appserver/src/classrep/test.py
   trunk/gnue-appserver/src/geasBClass.py
   trunk/gnue-appserver/src/geasTrigger.py
   trunk/gnue-appserver/src/language/test.py
   trunk/gnue-appserver/src/test.py
   trunk/gnue-appserver/src/testRPC.py
Log:
Removed translation-marks from test programs and self-test-code.


Modified: trunk/gnue-appserver/src/classrep/Definition.py
===================================================================
--- trunk/gnue-appserver/src/classrep/Definition.py     2004-03-08 09:51:27 UTC 
(rev 5256)
+++ trunk/gnue-appserver/src/classrep/Definition.py     2004-03-08 10:06:17 UTC 
(rev 5257)
@@ -137,23 +137,23 @@
 
   x = RepositoryDefinition ('repository.ini')
 
-  print _("\nModules:")
+  print "\nModules:"
   for m in x.modules ():
     print m
 
 
-  print _("\nClasses:")
+  print "\nClasses:"
   for c in x.classes ():
     print c
 
-  print _("\nProperties:")
+  print "\nProperties:"
   for p in x.properties ():
     print p
 
   print "\n\n"
 
   for p in x.properties ('gnue_module'):
-    print _("gnue_module::"), p
+    print "gnue_module::", p
 
 
   print "----"

Modified: trunk/gnue-appserver/src/classrep/dtest.py
===================================================================
--- trunk/gnue-appserver/src/classrep/dtest.py  2004-03-08 09:51:27 UTC (rev 
5256)
+++ trunk/gnue-appserver/src/classrep/dtest.py  2004-03-08 10:06:17 UTC (rev 
5257)
@@ -31,56 +31,56 @@
   app = testApp ()
   sm = app.getSessionManager ()
 
-  print _("Requesting class 'gnue_property'\n")
+  print "Requesting class 'gnue_property'\n"
   klass = sm.classes ["gnue_property"]
 
   print "\n"
 
-  print _("Requesting class 'address_person'\n")
+  print "Requesting class 'address_person'\n"
 
 # -------------
   klass = sm.classes ["address_person"]
 
-  print _("Name = %s, Comment = %s, Fullname = %s\n") % (klass.gnue_name, 
+  print "Name = %s, Comment = %s, Fullname = %s\n" % (klass.gnue_name, 
                     klass.gnue_comment, klass.fullName)
-  print _("Number of properties in class: %d") % len (klass.properties)
-  print _("Properties:")
+  print "Number of properties in class: %d" % len (klass.properties)
+  print "Properties:"
 
 
   for p in klass.properties.keys ():
     pObj = klass.properties [p]
-    print _("Property %s: %s (%s)") % (pObj.gnue_name, pObj.gnue_type, 
+    print "Property %s: %s (%s)" % (pObj.gnue_name, pObj.gnue_type, 
         pObj.gnue_comment)
-  print _("End of properties")
+  print "End of properties"
 
   klass = sm.classes ["gnue_module"]
-  print _("Number of properties in %s: %d") % (klass.fullName, 
+  print "Number of properties in %s: %d" % (klass.fullName, 
                       len (klass.properties))
 
 # print sm.Classes.keys ()
 
 # -----------------
 
-  print _("Now it should come faster (cached):\n")
+  print "Now it should come faster (cached):\n"
 
   klass = sm.classes ["address_person"]
 
-  print _("Name = %s, Comment = %s, Fullname = %s\n") % (klass.gnue_name, 
+  print "Name = %s, Comment = %s, Fullname = %s\n" % (klass.gnue_name, 
                     klass.gnue_comment, klass.fullName)
-  print _("Number of properties in class: %d") % len (klass.properties)
+  print "Number of properties in class: %d" % len (klass.properties)
 
 
   for p in klass.properties.keys ():
     pObj = klass.properties [p]
-    print _("Property %s: %s (%s)") % (pObj.gnue_name, pObj.gnue_type, 
+    print "Property %s: %s (%s)" % (pObj.gnue_name, pObj.gnue_type, 
          pObj.gnue_comment)
 
 # ---- gnue_*
 
-  print _("Fetching gnue_class :)")
+  print "Fetching gnue_class :)"
   gclass = sm.classes ["gnue_class"]
-  print _("Name = %s (full:%s) Comment = %s") % \
+  print "Name = %s (full:%s) Comment = %s" % \
          (gclass.gnue_name, gclass.fullName, gclass.gnue_comment)
 
-  print _("Number of properties: %d") % len (gclass.properties)
+  print "Number of properties: %d" % len (gclass.properties)
 

Modified: trunk/gnue-appserver/src/classrep/mtest.py
===================================================================
--- trunk/gnue-appserver/src/classrep/mtest.py  2004-03-08 09:51:27 UTC (rev 
5256)
+++ trunk/gnue-appserver/src/classrep/mtest.py  2004-03-08 10:06:17 UTC (rev 
5257)
@@ -31,24 +31,24 @@
 # Dump some values of a class definition
 # -----------------------------------------------------------------------------
 def dumpClass (aName):
-  print _("\nRequesting class '%s' ...") % aName
+  print "\nRequesting class '%s' ..." % aName
   aClass = sm.classes [aName]
 
-  print _("Fullname: %s") % aClass.fullName
-  print _("Id      : %s") % aClass.gnue_id
-  print _("Module  : %s") % aClass.module.fullName
-  print _("Comment : %s") % aClass.gnue_comment
+  print "Fullname: %s" % aClass.fullName
+  print "Id      : %s" % aClass.gnue_id
+  print "Module  : %s" % aClass.module.fullName
+  print "Comment : %s" % aClass.gnue_comment
 
-  print _("\nProperties:")
+  print "\nProperties:"
 
   for prop in aClass.properties.values ():
-    print _("Fullname: %s") % prop.fullName
-    print _("Comment : %s") % prop.gnue_comment
-    print _("Module  : %s") % prop.gnue_module
-    print _("Type    : %s") % prop.gnue_type
+    print "Fullname: %s" % prop.fullName
+    print "Comment : %s" % prop.gnue_comment
+    print "Module  : %s" % prop.gnue_module
+    print "Type    : %s" % prop.gnue_type
     print 
 
-  print _("End of dump for '%s'\n") % aName
+  print "End of dump for '%s'\n" % aName
 
 if __name__ == '__main__':
   # First we have to create a session from the language interface
@@ -59,9 +59,9 @@
   dumpClass ('address_person')
   dumpClass ('gnue_class')
 
-  print _("Searching for property 'gnue_name' in class 'gnue_property' ...")
+  print "Searching for property 'gnue_name' in class 'gnue_property' ..."
   x = sm.classes ['gnue_property']
   y = x.findProp ('gnue_name')
-  print _("Fullname: %s") % y.fullName
-  print _("Module  : %s") % y.gnue_module
-  print _("Type    : %s") % y.gnue_type
+  print "Fullname: %s" % y.fullName
+  print "Module  : %s" % y.gnue_module
+  print "Type    : %s" % y.gnue_type

Modified: trunk/gnue-appserver/src/classrep/test.py
===================================================================
--- trunk/gnue-appserver/src/classrep/test.py   2004-03-08 09:51:27 UTC (rev 
5256)
+++ trunk/gnue-appserver/src/classrep/test.py   2004-03-08 10:06:17 UTC (rev 
5257)
@@ -28,18 +28,18 @@
   app = testApp ()
   sm  = app.getSessionManager ()
 
-  print _("Already loaded modules:"), sm.modules.keys ()
-  print _("Already loaded classes:"), sm.classes.keys ()
+  print "Already loaded modules:", sm.modules.keys ()
+  print "Already loaded classes:", sm.classes.keys ()
 
-  print _("Modules:"), sm.modules.values ()
+  print "Modules:", sm.modules.values ()
 
-  print _('\nModule "address":')
+  print '\nModule "address":'
   m = sm.modules ["address"]
   m._session.setcontext ('address')
   # m = sm.modules ["gnue"]
   print "%s: %s\n" % (m.gnue_name, m.gnue_comment)
 
-  print _("Classes in 'address':")
+  print "Classes in 'address':"
   for k in m.classes.keys ():
     print k
     cl = m.classes [k]
@@ -47,28 +47,28 @@
       print cl.fullName + "." + p
     print "-" * 50
 
-  print _("Procedures of 'address_person':")
+  print "Procedures of 'address_person':"
   ap = m.classes ['address_person']
   for pr in ap.procedures.values ():
-    print _("%s coded in %s") % (pr.fullName, pr.gnue_language)
+    print "%s coded in %s" % (pr.fullName, pr.gnue_language)
 
-  print _("Number of modules: %d\n") % len (sm.modules)
+  print "Number of modules: %d\n" % len (sm.modules)
 
-  print _("All modules via keys ():")
+  print "All modules via keys ():"
   for k in sm.modules.keys ():
     m = sm.modules [k]
     print k, ":", m.gnue_comment
 
   print
-  print _("All modules via values ():")
+  print "All modules via values ():"
   for m in sm.modules.values ():
     print m.gnue_name + ": " + m.gnue_comment
 
   print
-  print _("All modules via items ():")
+  print "All modules via items ():"
   for i in sm.modules.items ():
     print i
 
   print
-  print _('Is there a module "address": %d') % sm.modules.has_key ("address")
-  print _('Is there a module "foo": %d') % sm.modules.has_key ("foo")
+  print 'Is there a module "address": %d' % sm.modules.has_key ("address")
+  print 'Is there a module "foo": %d' % sm.modules.has_key ("foo")

Modified: trunk/gnue-appserver/src/geasBClass.py
===================================================================
--- trunk/gnue-appserver/src/geasBClass.py      2004-03-08 09:51:27 UTC (rev 
5256)
+++ trunk/gnue-appserver/src/geasBClass.py      2004-03-08 10:06:17 UTC (rev 
5257)
@@ -121,7 +121,7 @@
         # store record here
         pass
       else:        
-        print _("'%s' is no valid obj id") % i
+        print "'%s' is no valid obj id" % i
   
   def call(self,obj_id_list,methodname,parameters):
     pass
@@ -133,4 +133,4 @@
         # store record here
         pass
       else:        
-        print _("'%s' is no valid obj id") % i
+        print "'%s' is no valid obj id" % i

Modified: trunk/gnue-appserver/src/geasTrigger.py
===================================================================
--- trunk/gnue-appserver/src/geasTrigger.py     2004-03-08 09:51:27 UTC (rev 
5256)
+++ trunk/gnue-appserver/src/geasTrigger.py     2004-03-08 10:06:17 UTC (rev 
5257)
@@ -19,7 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: geasTrigger.py,v 1.6 2003/09/01 18:01:45 reinhard Exp $
+# $Id$
 
 import string,new
 
@@ -87,7 +87,7 @@
     # no such trigger
     if instance==None:
       # log something
-      print _("Trigger '%s' does not exist.") % triggername
+      print "Trigger '%s' does not exist." % triggername
 
       return None
 

Modified: trunk/gnue-appserver/src/language/test.py
===================================================================
--- trunk/gnue-appserver/src/language/test.py   2004-03-08 09:51:27 UTC (rev 
5256)
+++ trunk/gnue-appserver/src/language/test.py   2004-03-08 10:06:17 UTC (rev 
5257)
@@ -27,27 +27,27 @@
 if __name__ == "__main__":
   app = App.App ()
 
-  print _("requesting new session ...")
+  print "requesting new session ..."
   session = app.newSession ('test', 'test')
 
-  print _("fetching all persons...")
+  print "fetching all persons..."
   session.setcontext ('address')
   list = session.find ('person', sort = ['address_name'],
                        properties = ['address_name', 'address_street'])
 
-  print _('Found %d instances.') % len (list)
+  print 'Found %d instances.' % len (list)
 
   for person in list:
     print '-' * 79
-    print _('Name   : %s') % repr (person.name)
-    print _('Street : %s') % repr (person.address_street)
-    print _('City   : %s') % repr (person.address_city)
+    print 'Name   : %s' % repr (person.name)
+    print 'Street : %s' % repr (person.address_street)
+    print 'City   : %s' % repr (person.address_city)
 
     if person.address_country is not None:
-      print _('Country: %s') % repr (person.address_country.address_name)
+      print 'Country: %s' % repr (person.address_country.address_name)
 
-    print _('Number of Children: %s') % repr (person.address_children)
-    print _('Weight: %s') % repr (person.address_weight)
-    print _('Born  : %s') % repr (person.address_born)
-    print _('Human : %s') % repr (person.address_human)
+    print 'Number of Children: %s' % repr (person.address_children)
+    print 'Weight: %s' % repr (person.address_weight)
+    print 'Born  : %s' % repr (person.address_born)
+    print 'Human : %s' % repr (person.address_human)
 

Modified: trunk/gnue-appserver/src/test.py
===================================================================
--- trunk/gnue-appserver/src/test.py    2004-03-08 09:51:27 UTC (rev 5256)
+++ trunk/gnue-appserver/src/test.py    2004-03-08 10:06:17 UTC (rev 5257)
@@ -46,7 +46,7 @@
   def getSessionManager (self):
     self.connections.setLoginHandler (testLoginHandler ())
 
-    print _("Creating session manager ...")
+    print "Creating session manager ..."
     sm = geasSessionManager (self.connections)
 
     return sm
@@ -58,28 +58,28 @@
   def run (self):
     sm = self.getSessionManager ()
 
-    print _("Opening session ...")
+    print "Opening session ..."
     session = sm.open ({"user":"hacker", "password":"secret"})
 
-    print _("Creating and populating list object ...")
+    print "Creating and populating list object ..."
     list = sm.request (session, "address_person", [], ["address_zip"],
                        ["address_name", "address_street", "address_city"])
 
-    print _("Retrieving first instance ...")
+    print "Retrieving first instance ..."
     rset = sm.fetch (session,list,0,1)
 
-    print _("These are the values of the first instance:")
-    print _("  Name  :"), rset[0][1]
-    print _("  Street:"), rset[0][2]
-    print _("  City  :"), rset[0][3]
+    print "These are the values of the first instance:"
+    print "  Name  :", rset[0][1]
+    print "  Street:", rset[0][2]
+    print "  City  :", rset[0][3]
 
-    print _("Now I call the procedure 'show' for the first instance:")
+    print "Now I call the procedure 'show' for the first instance:"
     sm.call (session, "address_person", [rset[0][0]], "address_show", "")
 
-    print _("Now I call the procedure 'test' for the first instance:")
+    print "Now I call the procedure 'test' for the first instance:"
     sm.call (session, "address_person", [rset[0][0]], "address_test", "")
 
-    print _("Committing and closing session ...")
+    print "Committing and closing session ..."
     sm.close (session, 1)
 
 
@@ -97,4 +97,4 @@
 # =============================================================================
 if __name__ == "__main__":
   testApp().run()
-  print _("Thank you for playing!")
+  print "Thank you for playing!"

Modified: trunk/gnue-appserver/src/testRPC.py
===================================================================
--- trunk/gnue-appserver/src/testRPC.py 2004-03-08 09:51:27 UTC (rev 5256)
+++ trunk/gnue-appserver/src/testRPC.py 2004-03-08 10:06:17 UTC (rev 5257)
@@ -44,10 +44,10 @@
   # ---------------------------------------------------------------------------
 
   def getSessionManager (self):
-    print _("Opening RPC connection ...")
+    print "Opening RPC connection ..."
     server = GComm.attach (self.type, self.params)
 
-    print _("Setup an link to the session manager")
+    print "Setup an link to the session manager"
     sm = server.request ("Session")
 
     return sm
@@ -65,4 +65,4 @@
       app.setConnection('pyro',{})
   
   app.run()
-  print _("Thank you for playing!")
+  print "Thank you for playing!"