Changeset 2625

Show
Ignore:
Timestamp:
01/17/06 14:45:27 (19 years ago)
Author:
jerome
Message:

Now unconditionally aborts pjl or snmp querying on any exception.

Location:
pykota/trunk/pykota/accounters
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • pykota/trunk/pykota/accounters/pjl.py

    r2622 r2625  
    195195            self.waitIdle()     
    196196        except :     
    197             if self.printerInternalPageCounter is None : 
    198                 raise 
    199             else :     
    200                 self.parent.filter.printInfo(_("PJL querying stage interrupted. Using latest value seen for internal page counter (%s) on printer %s.") % (self.printerInternalPageCounter, self.parent.filter.PrinterName), "warn") 
     197            self.parent.filter.printInfo(_("PJL querying stage interrupted. Using latest value seen for internal page counter (%s) on printer %s.") % (self.printerInternalPageCounter, self.parent.filter.PrinterName), "warn") 
     198            raise 
    201199        return self.printerInternalPageCounter 
    202200             

  • pykota/trunk/pykota/accounters/snmp.py

    r2622 r2625  
    204204                self.waitIdle()     
    205205            except :     
    206                 if self.printerInternalPageCounter is None : 
    207                     raise 
    208                 else :     
    209                     self.parent.filter.printInfo(_("SNMP querying stage interrupted. Using latest value seen for internal page counter (%s) on printer %s.") % (self.printerInternalPageCounter, self.parent.filter.PrinterName), "warn") 
     206                self.parent.filter.printInfo(_("SNMP querying stage interrupted. Using latest value seen for internal page counter (%s) on printer %s.") % (self.printerInternalPageCounter, self.parent.filter.PrinterName), "warn") 
     207                raise 
    210208            return self.printerInternalPageCounter 
    211209