Changeset 2919

Timestamp:

06/06/06 00:08:49 (18 years ago)

Author:

jerome

Message:

Added support for pkipplib v0.06

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (1 diff)
• pykota/version.py (modified) (1 diff)

pykota/trunk/bin/cupspykota

@@ -286 +286 @@
         if haspkipplib :
             self.ControlFile = "NotUsedAnymore"
-            cupsurl = "http://%s:%s" % \
-                               (os.environ.get("CUPS_SERVER") or "localhost", \
-                                os.environ.get("IPP_PORT", "631"))
-            self.logdebug("Querying CUPS server at %s" % cupsurl)                    
-            cupsserver = pkipplib.CUPS(url=cupsurl) # TODO : username and password
+            self.logdebug("Querying CUPS server...")
+            cupsserver = pkipplib.CUPS() # TODO : username and password and/or encryption
             answer = cupsserver.getJobAttributes(self.JobId)
             if answer is None :
-                self.printInfo(_("Network error while querying the CUPS server at %s (maybe incorrect authentication)") \
-                                          % cupsurl, "error")
+                self.printInfo(_("Network error while querying the CUPS server : %s") \
+                                          % cupsserver.lastErrorMessage, "error")
                 connerror = True                        
             else :    
-                self.logdebug("CUPS server at %s answered without error." % cupsurl)
+                self.logdebug("CUPS server answered without error.")
                 try :
                     john = answer.job["job-originating-host-name"]

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.25alpha5_unofficial"
+__version__ = "1.25alpha6_unofficial"
 
 __doc__ = "PyKota : a complete Printing Quota Solution for CUPS."