Changeset 23

Timestamp:

06/05/06 23:14:50 (18 years ago)

Author:

jerome

Message:

Now keeps the latest error and error messages seen.

Location:

pkipplib/trunk/pkipplib

Files:

• pkipplib.py (modified) (5 diffs)
• version.py (modified) (1 diff)

pkipplib/trunk/pkipplib/pkipplib.py

@@ -598 +598 @@
         except (urllib2.URLError, urllib2.HTTPError, socket.error), error :    
             self.error = error
-            sys.stderr.write("ERROR : %s\n" % str(error))
             return None
         else :    
@@ -617 +616 @@
         self.charset = charset
         self.language = language
+        self.lastError = None
+        self.lastErrorMessage = None
         
     def identifierToURI(self, service, ident) :
@@ -635 +636 @@
             return req
     
+    def doRequest(self, req) :
+        """Does a request and saves its error status in the lastErrorMessage attribute."""
+        result = req.doRequest()
+        self.lastError = req.error
+        self.lastErrorMessage = str(req.error)
+        return result
+        
     def getDefault(self) :
         """Retrieves CUPS' default printer."""
-        return self.newRequest(CUPS_GET_DEFAULT).doRequest()
+        return self.doRequest(self.newRequest(CUPS_GET_DEFAULT))
     
     def getJobAttributes(self, jobid) :    
@@ -643 +651 @@
         req = self.newRequest(IPP_GET_JOB_ATTRIBUTES)
         req.operation["job-uri"] = ("uri", self.identifierToURI("jobs", jobid))
-        return req.doRequest()
+        return self.doRequest(req)
         
     def getPPD(self, queuename) :    
@@ -651 +659 @@
         for attrib in ("printer-uri-supported", "printer-type", "member-uris") :
             req.operation["requested-attributes"] = ("nameWithoutLanguage", attrib)
-        return req.doRequest()  # TODO : get the PPD from the actual print server
+        return self.doRequest(req)  # TODO : get the PPD from the actual print server
         
             
 if __name__ == "__main__" :            
     if (len(sys.argv) < 2) or (sys.argv[1] == "--debug") :
-        print "usage : python ipp.py /var/spool/cups/c00005 [--debug] (for example)\n"
+        print "usage : python pkipplib.py /var/spool/cups/c00005 [--debug] (for example)\n"
     else :    
         infile = open(sys.argv[1], "rb")

pkipplib/trunk/pkipplib/version.py

@@ -21 +21 @@
 #
 
-__version__ = "0.05"
+__version__ = "0.06"
 
 __doc__ = "pkipplib : IPP and CUPS support for Python."