[jToolkit-cvs] jToolkit/widgets widgets.py,1.10,1.11

[<dav...@us...>]

Update of /cvsroot/jtoolkit/jToolkit/widgets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14323

Modified Files:
	widgets.py 
Log Message:
more unicode hacking ... (need to sort this all out properly later)



Index: widgets.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/widgets/widgets.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** widgets.py	9 Feb 2004 14:06:58 -0000	1.10
--- widgets.py	9 Feb 2004 14:22:41 -0000	1.11
***************
*** 58,61 ****
--- 58,62 ----
      if quote:
        s = '"' + s.replace('"', """) + '"'
+     if type(s) == unicode: s = s.encode('iso8859')
      return s
  
***************
*** 226,230 ****
  
    def gethtml(self):
!     return self.getheader() + self.getbody() + self.getfooter()
  
    def getheader(self):
--- 227,236 ----
  
    def gethtml(self):
!     header, body, footer = self.getheader(), self.getbody(), self.getfooter()
!     if unicode in (type(header), type(body), type(footer)):
!       if type(header) == str: header = header.decode('iso8859')
!       if type(body) == str: body = body.decode('iso8859')
!       if type(footer) == str: footer = footer.decode('iso8859')
!     return header + body + footer
  
    def getheader(self):
***************
*** 279,283 ****
        <h1>%s</h1>""" % (self.title)
      end = "</body>"
!     return start + self.getcontents() + end
  
    def getfooter(self):
--- 285,294 ----
        <h1>%s</h1>""" % (self.title)
      end = "</body>"
!     contents = self.getcontents()
!     if unicode in (type(start), type(contents), type(end)):
!       if type(start) == str: start = start.decode('iso8859')
!       if type(contents) == str: contents = contents.decode('iso8859')
!       if type(end) == str: end = end.decode('iso8859')
!     return start + contents + end
  
    def getfooter(self):