Changeset 21 for pkipplib/trunk

Timestamp:

06/02/06 21:10:02 (18 years ago)

Author:

jerome

Message:

Added support for HTTP Basic authentication ("AuthType? Basic"
and "AuthClass? User" in cupsd.conf).
Improved reliability.

Location:

pkipplib/trunk

Files:

• pkipplib/pkipplib.py (modified) (4 diffs)
• pkipplib/version.py (modified) (1 diff)
• README (modified) (1 diff)
• tests/test.py (modified) (1 diff)

pkipplib/trunk/pkipplib/pkipplib.py

@@ -25 +25 @@
 import sys
 import urllib2
+import socket
 from struct import pack, unpack
 
@@ -293 +294 @@
              debug : a boolean value to output debug info on stderr.
         """
-        self.url = url
+        if url.endswith("/") :
+            url = url[:-1]
+        self.url = url.replace("ipp://", "http://")
         self.username = username
         self.password = password
@@ -299 +302 @@
         self._data = data
         self.parsed = False
+        self.error = None
         
         # Initializes message
@@ -571 +575 @@
         if not samerequestid :
             self.nextRequestId()
-        cx = urllib2.Request(url=url or self.url or "http://localhost:631/", 
+            
+        url = url or self.url or "http://localhost:631"
+        cx = urllib2.Request(url=url, \
                              data=self.dump())
         cx.add_header("Content-Type", "application/ipp")
-        response = urllib2.urlopen(cx)
-        datas = response.read()
-        ippresponse = IPPRequest(datas)
-        ippresponse.parse()
-        return ippresponse
+        
+        username = username or self.username
+        password = password or self.password
+        if username :
+            password = password or ""
+            pwmanager = urllib2.HTTPPasswordMgrWithDefaultRealm()
+            pwmanager.add_password(None, \
+                                   "%s%s" % (cx.get_host(), cx.get_selector()), \
+                                   username, \
+                                   password)
+            authhandler = urllib2.HTTPBasicAuthHandler(pwmanager)                       
+            opener = urllib2.build_opener(authhandler)
+            urllib2.install_opener(opener)
+            
+        try :    
+            response = urllib2.urlopen(cx)
+        except (urllib2.HTTPError, socket.error), error :    
+            self.error = error
+            return None
+        else :    
+            self.error = None
+            datas = response.read()
+            ippresponse = IPPRequest(datas)
+            ippresponse.parse()
+            return ippresponse
         
             

pkipplib/trunk/pkipplib/version.py

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

pkipplib/trunk/README

@@ -109 +109 @@
 from pkipplib import pkipplib
 
-# By default, connects to http://localhost:631
+# Create a CUPS client instance
+# cups = pkipplib.CUPS(url="http://server:631", username="john", password="blah!")
 cups = pkipplib.CUPS()
 

pkipplib/trunk/tests/test.py

@@ -26 +26 @@
 import pkipplib        
     
-cups = pkipplib.CUPS()    
-answer = cups.getPPD("HL6050DN")
-#answer = cups.getJobAttributes(566)
+# cups = pkipplib.CUPS()
+cups = pkipplib.CUPS(url="http://localhost:631", \
+                     username="jerome", \
+                     password="9!kijd.7")
+# answer = cups.getPPD("HP2100")
+answer = cups.getJobAttributes(150)
+
 print answer
+
 #print answer.operation["attributes-charset"]