Changeset 42

Timestamp:

09/13/07 00:11:24 (17 years ago)

Author:

jerome

Message:

Now works again with http/ipp quries over the network, but still not
over unix domain sockets.

Files:

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

pkipplib/trunk/pkipplib/pkipplib.py

@@ -642 +642 @@
         """   
         url = url or self.url
-        connexion = urllib2.Request(url=url, \
+        connection = urllib2.Request(url=url, \
                              data=req.dump())
-        connexion.add_header("Content-Type", "application/ipp")
+        connection.add_header("Content-Type", "application/ipp")
         if self.username :
             pwmanager = urllib2.HTTPPasswordMgrWithDefaultRealm()
             pwmanager.add_password(None, \
-                                   "%s%s" % (connexion.get_host(), connexion.get_selector()), \
+                                   "%s%s" % (connection.get_host(), \
+                                             connection.get_selector()), \
                                    self.username, \
                                    self.password or "")
@@ -668 +669 @@
                         s.settimeout(5.0)
                         sys.stderr.write("Opened [%s]\n" % req.get_selector())
-                        return s
-                        #return s.makefile("r+b")
+                        return s.makefile(mode="r+b")
                         
                 opener = urllib2.build_opener(SocketHandler())  
@@ -677 +677 @@
         self.lastErrorMessage = None
         try :    
-            response = urllib2.urlopen(connexion)
+            response = urllib2.urlopen(connection)
         except (urllib2.URLError, urllib2.HTTPError, socket.error), error :    
             self.lastError = error
@@ -687 +687 @@
                 try :
                     while True :
-                        byte = response.read(1)
+                        try :
+                            byte = response.read(1)
+                        except AttributeError :    
+                            byte = response.recv(1)
                         if not byte :
                             break
                         else :    
                             bytes.append(byte)
-                except socket.timeout :
+                except socket.error :
+                    sys.stderr.write("socket error\n")
                     pass
             finally :
                 datas = "".join(bytes)
-            #datas = response.read()
-            ippresponse = IPPRequest(datas)
-            ippresponse.parse()
-            return ippresponse
+            if datas :
+                ippresponse = IPPRequest(datas)
+                ippresponse.parse()
+                return ippresponse
+            else :
+                return None
     
     def getPPD(self, queuename) :