Changeset 3413 for pykota/trunk/pykota/accounters/software.py

Timestamp:

09/27/08 22:02:37 (16 years ago)

Author:

jerome

Message:

Removed unnecessary spaces at EOL.

Files:

• pykota/trunk/pykota/accounters/software.py (modified) (7 diffs)

pykota/trunk/pykota/accounters/software.py

@@ -8 +8 @@
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -30 +30 @@
 
 class Accounter(AccounterBase) :
-    def computeJobSize(self) :    
+    def computeJobSize(self) :
         """Feeds an external command with our datas to let it compute the job size, and return its value."""
         if (not self.isPreAccounter) and \
@@ -39 +39 @@
             self.filter.logdebug("Precomputing pass told us that job is %s pages long." % self.filter.softwareJobSize)
             return self.filter.softwareJobSize   # Optimize : already computed !
-            
+
         if self.arguments :
             self.filter.logdebug("Using external script %s to compute job's size." % self.arguments)
             return self.withExternalScript()
-        else :    
+        else :
             self.filter.logdebug("Using internal parser to compute job's size.")
             return self.withInternalParser()
-        
-    def withInternalParser(self) :    
+
+    def withInternalParser(self) :
         """Does software accounting through an external script."""
         jobsize = 0
@@ -53 +53 @@
             try :
                 from pkpgpdls import analyzer, pdlparser
-            except ImportError :    
+            except ImportError :
                 self.filter.printInfo("pkpgcounter is now distributed separately, please grab it from http://www.pykota.com/software/pkpgcounter", "error")
                 self.filter.printInfo("Precomputed job size will be forced to 0 pages.", "error")
-            else :     
+            else :
                 try :
                     parser = analyzer.PDLAnalyzer(self.filter.DataFile)
                     jobsize = parser.getJobSize()
-                except pdlparser.PDLParserError, msg :    
+                except pdlparser.PDLParserError, msg :
                     # Here we just log the failure, but
                     # we finally ignore it and return 0 since this
@@ -66 +66 @@
                     # job's size MAY be.
                     self.filter.printInfo(_("Unable to precompute the job's size with the generic PDL analyzer : %s") % msg, "warn")
-                else :    
+                else :
                     try :
                         if self.filter.Ticket.FileName is not None :
-                            # when a filename is passed as an argument, the backend 
+                            # when a filename is passed as an argument, the backend
                             # must generate the correct number of copies.
                             jobsize *= self.filter.Ticket.Copies
                     except AttributeError : # When not run from the cupspykota backend
                         pass
-        return jobsize        
-                
-    def withExternalScript(self) :    
+        return jobsize
+
+    def withExternalScript(self) :
         """Does software accounting through an external script."""
         self.filter.logdebug(_("Launching SOFTWARE(%s)...") % self.arguments)
@@ -83 +83 @@
         try :
             answer = child.read()
-        except (IOError, OSError), msg :    
-            msg = "%s : %s" % (self.arguments, msg) 
+        except (IOError, OSError), msg :
+            msg = "%s : %s" % (self.arguments, msg)
             self.filter.printInfo(_("Unable to compute job size with accounter %s") % msg, "warn")
-        else :    
+        else :
             lines = [l.strip() for l in answer.split("\n")]
-            for i in range(len(lines)) : 
+            for i in range(len(lines)) :
                 try :
                     pagecounter = int(lines[i])
                 except (AttributeError, ValueError) :
                     self.filter.logdebug(_("Line [%s] skipped in accounter's output. Trying again...") % lines[i])
-                else :    
+                else :
                     break
-                    
+
         status = child.close()
         try :
             if os.WIFEXITED(status) :
                 status = os.WEXITSTATUS(status)
-        except TypeError :        
+        except TypeError :
             pass # None means no error occured.
         self.filter.logdebug(_("Software accounter %s exit code is %s") % (self.arguments, str(status)))
-            
-        if pagecounter is None :    
+
+        if pagecounter is None :
             message = _("Unable to compute job size with accounter %s") % self.arguments
             if self.onerror == "CONTINUE" :
@@ -111 +111 @@
                 raise PyKotaAccounterError, message
         self.filter.logdebug("Software accounter %s said job is %s pages long." % (self.arguments, repr(pagecounter)))
-            
-        pagecounter = pagecounter or 0    
+
+        pagecounter = pagecounter or 0
         try :
             if self.filter.Ticket.FileName is not None :
-                # when a filename is passed as an argument, the backend 
+                # when a filename is passed as an argument, the backend
                 # must generate the correct number of copies.
                 pagecounter *= self.filter.Ticket.Copies
-        except AttributeError :        
+        except AttributeError :
             pass # when called from pykotme. TODO : clean this mess some day.
-                        
+
         return pagecounter