gnue-reports/src/adapters/filters/Universal Bas...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-reports
Branch:         
Changes by:     Jason Cater <address@hidden>    03/10/06 15:23:18

Modified files:
        src/adapters/filters/Universal/Base: Parser.py 
        src/adapters/filters/Universal/pcl5: Writer.py 
        src/adapters/filters/Universal/pdf: Writer.py 
        src/adapters/filters/Universal/postscript: Writer.py 
        src/adapters/filters/Universal/postscript/psutils: 
                                                           PrinterDefinition.py 

Log message:
        fixed python syntax errors, so modules will compile

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/Base/Parser.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/pcl5/Writer.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/pdf/Writer.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/postscript/Writer.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-reports/src/adapters/filters/Universal/postscript/psutils/PrinterDefinition.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: gnue-reports/src/adapters/filters/Universal/Base/Parser.py
diff -c gnue-reports/src/adapters/filters/Universal/Base/Parser.py:1.9 
gnue-reports/src/adapters/filters/Universal/Base/Parser.py:1.10
*** gnue-reports/src/adapters/filters/Universal/Base/Parser.py:1.9      Tue May 
13 14:58:25 2003
--- gnue-reports/src/adapters/filters/Universal/Base/Parser.py  Mon Oct  6 
15:23:17 2003
***************
*** 156,162 ****
                 'Default': '0' },
              'spacinghoriz':      {
                 'Typecast': measurement, 
!                'Default': '0'  } } },
           'ParentTags':  ('parameters',) },
  
        'sortoptions':  {
--- 156,162 ----
                 'Default': '0' },
              'spacinghoriz':      {
                 'Typecast': measurement, 
!                'Default': '0'  } } ,
           'ParentTags':  ('parameters',) },
  
        'sortoptions':  {
Index: gnue-reports/src/adapters/filters/Universal/pcl5/Writer.py
diff -c gnue-reports/src/adapters/filters/Universal/pcl5/Writer.py:1.3 
gnue-reports/src/adapters/filters/Universal/pcl5/Writer.py:1.4
*** gnue-reports/src/adapters/filters/Universal/pcl5/Writer.py:1.3      Tue May 
13 14:58:25 2003
--- gnue-reports/src/adapters/filters/Universal/pcl5/Writer.py  Mon Oct  6 
15:23:17 2003
***************
*** 101,107 ****
    "Reverse Landscape": "\x1B\x26\x6C\x33\x4F",
  }
  
! _TYPEFACE_INIT {
    "LinePrinter": "\x1B\x28\x73\x30\x54",
    "Albertus": "\x1B\x28\x73\x34\x33\x36\x32\x54",
    "Antique Olive": "\x1B\x28\x73\x34\x31\x36\x38\x54",
--- 101,107 ----
    "Reverse Landscape": "\x1B\x26\x6C\x33\x4F",
  }
  
! _TYPEFACE_INIT = {
    "LinePrinter": "\x1B\x28\x73\x30\x54",
    "Albertus": "\x1B\x28\x73\x34\x33\x36\x32\x54",
    "Antique Olive": "\x1B\x28\x73\x34\x31\x36\x38\x54",
***************
*** 120,126 ****
    "Wingdings": "\x1B\x28\x73\x33\x31\x34\x30\x32\x54",
  }
  
! _FONTWEIGHT_INIT {
    "Ultra Thin": "\x1B\x28\x73\x2D\x37\x42",
    "Extra Thin": "\x1B\x28\x73\x2D\x36\x42",
    "Thin": "\x1B\x28\x73\x2D\x35\x42",
--- 120,126 ----
    "Wingdings": "\x1B\x28\x73\x33\x31\x34\x30\x32\x54",
  }
  
! _FONTWEIGHT_INIT = {
    "Ultra Thin": "\x1B\x28\x73\x2D\x37\x42",
    "Extra Thin": "\x1B\x28\x73\x2D\x36\x42",
    "Thin": "\x1B\x28\x73\x2D\x35\x42",
Index: gnue-reports/src/adapters/filters/Universal/pdf/Writer.py
diff -c gnue-reports/src/adapters/filters/Universal/pdf/Writer.py:1.3 
gnue-reports/src/adapters/filters/Universal/pdf/Writer.py:1.4
*** gnue-reports/src/adapters/filters/Universal/pdf/Writer.py:1.3       Tue May 
13 14:58:25 2003
--- gnue-reports/src/adapters/filters/Universal/pdf/Writer.py   Mon Oct  6 
15:23:17 2003
***************
*** 30,36 ****
  
  try:
    from reportlab import pdfbase
! except ImportError
    raise "Unable to load ReportLab's pdflib, which is required for writing PDF 
files."
  
  from gnue.reports.adapters.filters.Universal.Base.Writers.AbsoluteWriter 
import *
--- 30,36 ----
  
  try:
    from reportlab import pdfbase
! except ImportError:
    raise "Unable to load ReportLab's pdflib, which is required for writing PDF 
files."
  
  from gnue.reports.adapters.filters.Universal.Base.Writers.AbsoluteWriter 
import *
Index: gnue-reports/src/adapters/filters/Universal/postscript/Writer.py
diff -c gnue-reports/src/adapters/filters/Universal/postscript/Writer.py:1.5 
gnue-reports/src/adapters/filters/Universal/postscript/Writer.py:1.6
*** gnue-reports/src/adapters/filters/Universal/postscript/Writer.py:1.5        
Tue May 13 14:58:26 2003
--- gnue-reports/src/adapters/filters/Universal/postscript/Writer.py    Mon Oct 
 6 15:23:17 2003
***************
*** 114,120 ****
      #
      # Create our procset
      #
!     text = "/Bd {bind def} bind")
  
      for func in _PROCSET.keys():
        text  += " /%s {%s} Bd" % (func, _PROCSET[next][1])
--- 114,120 ----
      #
      # Create our procset
      #
!     text = "/Bd {bind def} bind"
  
      for func in _PROCSET.keys():
        text  += " /%s {%s} Bd" % (func, _PROCSET[next][1])
Index: 
gnue-reports/src/adapters/filters/Universal/postscript/psutils/PrinterDefinition.py
diff -c 
gnue-reports/src/adapters/filters/Universal/postscript/psutils/PrinterDefinition.py:1.14
 
gnue-reports/src/adapters/filters/Universal/postscript/psutils/PrinterDefinition.py:1.15
*** 
gnue-reports/src/adapters/filters/Universal/postscript/psutils/PrinterDefinition.py:1.14
    Tue May 13 14:58:26 2003
--- 
gnue-reports/src/adapters/filters/Universal/postscript/psutils/PrinterDefinition.py
 Mon Oct  6 15:23:18 2003
***************
*** 74,88 ****
      rv = ""
      if self.copies > 1:
        rv += "<< /NumCopies %d >> setpagedevice\n" % self.copies
!     self self.landscape:
!       rv +=
      return rv
  
    def getDscPageSetup(self):
      # Cache the page setup code as it (currently?)
      #  doesn't change from one page to the next.
      try:
!       return = self.__pageSetupCode
      except:
        rv = ""
        if self.landscape:
--- 74,88 ----
      rv = ""
      if self.copies > 1:
        rv += "<< /NumCopies %d >> setpagedevice\n" % self.copies
!     if self.landscape:
!       rv += "" ### TODO
      return rv
  
    def getDscPageSetup(self):
      # Cache the page setup code as it (currently?)
      #  doesn't change from one page to the next.
      try:
!       return self.__pageSetupCode
      except:
        rv = ""
        if self.landscape: