Changeset 3335

Timestamp:

02/18/08 17:15:34 (17 years ago)

Author:

jerome

Message:

Moved some methods around.

Location:

pykota/trunk

Files:

• bin/pkbanner (modified) (2 diffs)
• pykota/commandline.py (modified) (1 diff)
• pykota/pdfutils.py (copied) (copied from pykota/trunk/pykota/__init__.py) (1 diff)

pykota/trunk/bin/pkbanner

@@ -47 +47 @@
     
 import pykota.appinit
-from pykota.utils import run, loginvalidparam
-from pykota.commandline import PyKotaOptionParser
-
+from pykota.utils import run
+from pykota.commandline import PyKotaOptionParser, \
+                               checkandset_pagesize, \
+                               checkandset_savetoner
+from pykota.pdfutils import getPageSize
 from pykota.errors import PyKotaToolError
 from pykota.tool import Tool
 from pykota import version
 
-def getPageSize(pgsize) :
-    """Returns the correct page size or None if not found."""
-    try :
-        try :
-            return getattr(reportlab.lib.pagesizes, pgsize.upper())
-        except AttributeError :    
-            try :
-                return getattr(reportlab.lib.pagesizes, pgsize.lower())
-            except AttributeError :
-                pass
-    except UnicodeError :            
-        pass
-    return None        
-    
 class PyKotaBanner(Tool) :        
     """A class for pkbanner."""
@@ -241 +229 @@
 
 if __name__ == "__main__" :
-    def checkandset_pagesize(option, opt, value, optionparser) :
-        """Checks and sets the page size."""
-        if getPageSize(value) is None :
-            loginvalidparam(opt, value, option.default)
-            setattr(optionparser.values, option.dest, option.default)
-        else :    
-            setattr(optionparser.values, option.dest, value)
-        
-    def checkandset_savetoner(option, opt, value, optionparser) :    
-        """Checks and sets the save toner value."""
-        if (value < 0.0) or (value > 99.0) :
-            loginvalidparam(opt, value, option.default, \
-                            _("Allowed range is (0..99)"))
-            setattr(optionparser.values, option.dest, option.default)
-        else :    
-            setattr(optionparser.values, option.dest, value)
-        
     # TODO : --papertray : to print banners on a different paper (colored for example)
     parser = PyKotaOptionParser(description=_("Banner generator for PyKota."))

pykota/trunk/pykota/commandline.py

@@ -28 +28 @@
 
 from pykota import version
+from pykota.utils import loginvalidparam
+
+def checkandset_pagesize(option, opt, value, optionparser) :
+    """Checks and sets the page size."""
+    from pykota.pdfutils import getPageSize
+    if getPageSize(value) is None :
+        loginvalidparam(opt, value, option.default)
+        setattr(optionparser.values, option.dest, option.default)
+    else :    
+        setattr(optionparser.values, option.dest, value)
+    
+def checkandset_savetoner(option, opt, value, optionparser) :    
+    """Checks and sets the save toner value."""
+    if (value < 0.0) or (value > 99.0) :
+        loginvalidparam(opt, value, option.default, \
+                        _("Allowed range is (0..99)"))
+        setattr(optionparser.values, option.dest, option.default)
+    else :    
+        setattr(optionparser.values, option.dest, value)
 
 class PyKotaOptionParser(optparse.OptionParser) :

pykota/trunk/pykota/pdfutils.py

@@ -19 +19 @@
 # $Id$
 #
+
+"""This module contains helper methods for PDF related work."""
+
+def getPageSize(pgsize) :
+    """Returns the correct page size or None if not found."""
+    try :
+        import reportlab.lib.pagesizes as sizes
+    except ImportError :    
+        pass
+    else :    
+        try :
+            return getattr(sizes, pgsize.upper(), getattr(sizes, 
+                                                          pgsize.lower(), 
+                                                          None))
+        except UnicodeError :            
+            pass
+    return None