Changeset 3194

Timestamp:

06/27/07 18:16:02 (17 years ago)

Author:

jerome

Message:

Upgraded dependencies' version numbers.

Location:

pykota/trunk

Files:

• bin/pksetup (modified) (2 diffs)
• pykota/accounters/pjl.py (modified) (5 diffs)

pykota/trunk/bin/pksetup

@@ -197 +197 @@
         
     otherpackages = [ { "name" : "pkpgcounter",
-                        "version" : "2.16",
+                        "version" : "2.17",
                         "url" : "http://www.pykota.com/software/%(name)s/download/tarballs/%(name)s-%(version)s.tar.gz",
                         "commands" : [ "tar -zxf %(name)s-%(version)s.tar.gz",
@@ -213 +213 @@
                       },
                       { "name" : "ghostpcl",
-                        "version" : "1.41",
+                        "version" : "1.41p1",
                         "url" : "ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/GhostPCL/%(name)s_%(version)s.tar.bz2", 
                         "commands" : [ "bunzip2 <%(name)s_%(version)s.tar.bz2 | tar -xf -",

pykota/trunk/pykota/accounters/pjl.py

@@ -78 +78 @@
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         try :
+            sock.settimeout(2.0)
             sock.connect((self.printerHostname, self.port))
         except socket.error, msg :
@@ -83 +84 @@
             return False
         else :
-            sock.setblocking(False)
             self.sock = sock
             self.closed = False
@@ -90 +90 @@
             self.readthread = threading.Thread(target=self.readloop)
             self.readthread.start()
+            time.sleep(1)
             self.parent.filter.logdebug("Connected to printer %s:%s" % (self.printerHostname, self.port))
             return True
@@ -113 +114 @@
         while not self.quitEvent.isSet() :
             try :
-                answer = self.sock.recv(4096)
+                answer = self.sock.recv(1)
+            except socket.timeout :    
+                self.parent.filter.logdebug("Timed out when reading answer from %s:%s" \
+                                                % (self.printerHostname, self.port))
             except socket.error, (err, msg) :
-                time.sleep(0.1) # We will try again later in all cases
-                if err != errno.EAGAIN :
-                    self.parent.filter.printInfo(_("Problem while receiving PJL answer from %s:%s : %s") % (self.printerHostname, self.port, str(msg)), "warn")
+                self.parent.filter.printInfo(_("Problem while receiving PJL answer from %s:%s : %s") % (self.printerHostname, self.port, str(msg)), "warn")
             else :    
                 if answer :
@@ -131 +133 @@
         """Retrieves a printer's internal page counter and status via PJL."""
         try :
-            self.sock.sendall(pjlMessage)
+            nbsent = self.sock.send(pjlMessage)
+            if nbsent != len(pjlMessage) :
+                raise socket.error, "Short write"
         except socket.error, msg :
             self.parent.filter.printInfo(_("Problem while sending PJL query to %s:%s : %s") % (self.printerHostname, self.port, str(msg)), "warn")