Changeset 3468 for pkipplib/trunk

Timestamp:

12/12/08 00:31:04 (16 years ago)

Author:

jerome

Message:

Fixes #36 thanks to Mark Swift.

Files:

• pkipplib/trunk/pkipplib/pkipplib.py (modified) (3 diffs)

pkipplib/trunk/pkipplib/pkipplib.py

@@ -650 +650 @@
                              data=req.dump())
         connection.add_header("Content-Type", "application/ipp")
+        proxyhandler = urllib2.ProxyHandler({})
         if self.username :
             pwmanager = urllib2.HTTPPasswordMgrWithDefaultRealm()
@@ -658 +659 @@
                                    self.password or "")
             authhandler = urllib2.HTTPBasicAuthHandler(pwmanager)
-            opener = urllib2.build_opener(authhandler)
-            urllib2.install_opener(opener)
+            opener = urllib2.build_opener(proxyhandler, authhandler)
         else : # TODO : also do this in the 'if' part
-            if url.startswith("socket:") :
+            if not url.startswith("socket:") :
+                opener = urllib2.build_opener(proxyhandler)
+            else :
                 class SocketHandler(urllib2.HTTPHandler) :
                     """A class to handle IPP connections over an Unix domain socket."""
@@ -676 +678 @@
                         return s.makefile(mode="r+b")
 
-                opener = urllib2.build_opener(SocketHandler())
-                urllib2.install_opener(opener)
-                sys.stderr.write("Opener installed\n")
+                opener = urllib2.build_opener(proxyhandler, SocketHandler())
+
+        urllib2.install_opener(opener)
         self.lastError = None
         self.lastErrorMessage = None