gnue/common/src/definitions GObjects.py

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 03/03/28 10:19:11

Modified files:
        common/src/definitions: GObjects.py 

Log message:
        fix per ticket #248/230

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/definitions/GObjects.py.diff?tr1=1.55&tr2=1.56&r1=text&r2=text

Patches:
Index: gnue/common/src/definitions/GObjects.py
diff -c gnue/common/src/definitions/GObjects.py:1.55 
gnue/common/src/definitions/GObjects.py:1.56
*** gnue/common/src/definitions/GObjects.py:1.55        Mon Feb 17 02:32:50 2003
--- gnue/common/src/definitions/GObjects.py     Fri Mar 28 10:19:10 2003
***************
*** 239,250 ****
                addl = ' %s="N"' % (attribute)
            elif typecast == GTypecast.names:
              if type(val) == types.StringType:
!               addl = ' %s="%s"' % (attribute, 
string.join(val.decode(gConfig('textEncoding')),','))
              else:
                addl = ' %s="%s"' % (attribute, string.join(val,','))
            else:
              if type(val) == types.StringType:
!               addl = ' %s="%s"' % (attribute, saxutils.escape('%s' % 
val.decode(gConfig('textEncoding'))))
              else:
                addl = ' %s="%s"' % (attribute, saxutils.escape('%s' % val))
            if len(addl) + pos > 78:
--- 239,252 ----
                addl = ' %s="N"' % (attribute)
            elif typecast == GTypecast.names:
              if type(val) == types.StringType:
!               #addl = ' %s="%s"' % (attribute, 
string.join(val.decode(gConfig('textEncoding')),','))
!               addl = ' %s="%s"' % (attribute, 
string.join(unicode(val,gConfig('textEncoding')),','))
              else:
                addl = ' %s="%s"' % (attribute, string.join(val,','))
            else:
              if type(val) == types.StringType:
!               #addl = ' %s="%s"' % (attribute, saxutils.escape('%s' % 
val.decode(gConfig('textEncoding'))))
!               addl = ' %s="%s"' % (attribute, saxutils.escape('%s' % 
unicode(val,gConfig('textEncoding'))))
              else:
                addl = ' %s="%s"' % (attribute, saxutils.escape('%s' % val))
            if len(addl) + pos > 78:
***************
*** 256,262 ****
        if attribute.find('__') > 0 and attribute.split('__')[0] in 
xmlnamespaces.keys():
          if val != None:
            if type(val) == types.StringType:
!             addl = ' %s="%s"' % (attribute.replace('__',':'), 
saxutils.escape('%s' % val.decode(gConfig('textEncoding'))))
            else:
              addl = ' %s="%s"' % (attribute.replace('__',':'), 
saxutils.escape('%s' % val))
            if len(addl) + pos > 78:
--- 258,264 ----
        if attribute.find('__') > 0 and attribute.split('__')[0] in 
xmlnamespaces.keys():
          if val != None:
            if type(val) == types.StringType:
!             addl = ' %s="%s"' % (attribute.replace('__',':'), 
saxutils.escape('%s' % unicode(val,gConfig('textEncoding'))))
            else:
              addl = ' %s="%s"' % (attribute.replace('__',':'), 
saxutils.escape('%s' % val))
            if len(addl) + pos > 78: