Changeset 3430

Timestamp:

10/05/08 11:31:35 (16 years ago)

Author:

jerome

Message:

Another round of removing print statements.

Location:

pykota/trunk

Files:

• bin/pksetup (modified) (3 diffs)
• checkdeps.py (modified) (1 diff)
• pykota/tool.py (modified) (2 diffs)

pykota/trunk/bin/pksetup

@@ -269 +269 @@
         olddirectory = os.getcwd()
         directory = tempfile.mkdtemp()
-        print "\nDownloading additional software not available as packages in %(directory)s" % locals()
+        sys.stdout.write("\nDownloading additional software not available as packages in %(directory)s\n" % locals())
         os.chdir(directory)
         for package in self.otherpackages :
@@ -420 +420 @@
             self.setupBackend()
             self.managePrinters(self.listPrinters())
-            print nowready
-            print "The script %s can be used to reinstall in unattended mode.\n" % self.genInstaller()
+            sys.stdout.write("%s\n" % nowready)
+            sys.stdout.write("The script %s can be used to reinstall in unattended mode.\n\n" % self.genInstaller())
 
     def genInstaller(self) :
@@ -459 +459 @@
     retcode = 0
     if (len(sys.argv) != 2) or (sys.argv[1] == "-h") or (sys.argv[1] == "--help") :
-        print "pksetup v0.1 (c) 2003-2008 Jerome Alet - alet@librelogiciel.com\n\nusage : pksetup distribution\n\ne.g. : pksetup debian\n\nIMPORTANT : only Debian and Ubuntu are currently supported."
+        sys.stdout.write("pksetup v0.1 (c) 2003-2008 Jerome Alet - alet@librelogiciel.com\n\nusage : pksetup distribution\n\ne.g. : pksetup debian\n\nIMPORTANT : only Debian and Ubuntu are currently supported.\n")
     elif (sys.argv[1] == "-v") or (sys.argv[1] == "--version") :
-        print "0.1" # pksetup's own version number
+        sys.stdout.write("0.1\n") # pksetup's own version number
     else :
         classname = sys.argv[1].strip().title()

pykota/trunk/checkdeps.py

@@ -59 +59 @@
 
 if __name__ == "__main__" :
-    print "Checking PyKota dependencies..."
+    sys.stdout.write("Checking PyKota dependencies...\n")
 
     # checks if Python version is correct, we need >= 2.2

pykota/trunk/pykota/tool.py

@@ -210 +210 @@
         except AttributeError :
             pass
-        print __version__
+        self.display("%s\n" % __version__)
         sys.exit(0)
 
@@ -219 +219 @@
         except AttributeError :
             pass
-        print _(self.documentation) % globals()
-        print __gplblurb__
-        print
-        print _("Please report bugs to :"), __author__
+        self.display("%s\n" % (_(self.documentation) % globals()))
+        self.display("%s\n\n" % __gplblurb__)
+        self.display("%s %s\n" % (_("Please report bugs to :"), __author__))
         sys.exit(0)