Changeset 353 for pkpgcounter/trunk

Timestamp:

08/14/06 00:49:13 (18 years ago)

Author:

jerome

Message:

Cleaned up some uglyness, thanks to pylint.

Files:

• pkpgcounter/trunk/pkpgpdls/analyzer.py (modified) (5 diffs)

pkpgcounter/trunk/pkpgpdls/analyzer.py

@@ -20 +20 @@
 #
 
+"""This is the main module of pkpgcounter.
+
+It defines the PDLAnalyzer class, which provides a generic way to parse
+input files, by automatically detecting the best parser to use."""
+
 import sys
 import tempfile
@@ -26 +31 @@
        escp2, dvi, tiff, ooo, zjstream
 
-class NoOption :
-    """A class for use as a default parameter to PDLAnalyzer's constructor."""
-    debug = None
-    colorspace = None
-    resolution = None
+
+class AnalyzerOption :
+    """A class for use as the options parameter to PDLAnalyzer's constructor."""
+    def __init__(self, debug=None,
+                       colorspace=None,
+                       resolution=None) :
+        """Sets initial attributes."""
+        self.debug = debug
+        self.colorspace = colorspace
+        self.resolution = resolution
+    
     
 class PDLAnalyzer :    
     """Class for PDL autodetection."""
-    def __init__(self, filename, options=NoOption()) :
+    def __init__(self, filename, options=AnalyzerOption()) :
         """Initializes the PDL analyzer.
         
@@ -43 +54 @@
         self.options = options
         self.filename = filename
+        self.infile = None
+        self.mustclose = None
         
     def getJobSize(self) :    
@@ -95 +108 @@
             try :
                 self.infile.seek(0)
-            except :    
+            except IOError :    
                 pass    # probably stdin, which is not seekable
         
@@ -142 +155 @@
             return valower
         else :    
-            choices = ", ".join(map(repr, option.cichoices))
+            choices = ", ".join([repr(o) for o in option.cichoices])
             raise optparse.OptionValueError(
                 "option %s: invalid choice: %r (choose from %s)"