[Python-checkins] python/dist/src/Mac/scripts gensuitemodule.py,1.24,1.25
jackjansen@users.sourceforge.net
jackjansen@users.sourceforge.net
Wed, 07 Aug 2002 08:05:45 -0700
Update of /cvsroot/python/python/dist/src/Mac/scripts
In directory usw-pr-cvs1:/tmp/cvs-serv30207/scripts
Modified Files:
gensuitemodule.py
Log Message:
Don't be over-enthusiastic with the ascii() calls: we don't need it if
the result passes through backticks.
Index: gensuitemodule.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/scripts/gensuitemodule.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** gensuitemodule.py 7 Aug 2002 14:49:00 -0000 1.24
--- gensuitemodule.py 7 Aug 2002 15:05:42 -0000 1.25
***************
*** 318,322 ****
for codenamemapper in allprecompinfo:
for k, v in codenamemapper.getall('class'):
! fp.write("\t%s : %s,\n" % (`ascii(k)`, v))
fp.write("}\n")
--- 318,322 ----
for codenamemapper in allprecompinfo:
for k, v in codenamemapper.getall('class'):
! fp.write("\t%s : %s,\n" % (`k`, v))
fp.write("}\n")
***************
*** 326,330 ****
fp.write(",\n\t\t%s_Events"%modname)
fp.write(",\n\t\taetools.TalkTo):\n")
! fp.write("\t_signature = %s\n\n"%`ascii(creatorsignature)`)
fp.write("\t_moduleName = '%s'\n\n"%packagename)
fp.close()
--- 326,330 ----
fp.write(",\n\t\t%s_Events"%modname)
fp.write(",\n\t\taetools.TalkTo):\n")
! fp.write("\t_signature = %s\n\n"%`creatorsignature`)
fp.write("\t_moduleName = '%s'\n\n"%packagename)
fp.close()
***************
*** 394,398 ****
fp.write('import aetools\n')
fp.write('import MacOS\n\n')
! fp.write("_code = %s\n\n"% `ascii(code)`)
if basepackage and basepackage._code_to_module.has_key(code):
# We are an extension of a baseclass (usually an application extending
--- 394,398 ----
fp.write('import aetools\n')
fp.write('import MacOS\n\n')
! fp.write("_code = %s\n\n"% `code`)
if basepackage and basepackage._code_to_module.has_key(code):
# We are an extension of a baseclass (usually an application extending
***************
*** 453,457 ****
fp.write("\t_argmap_%s = {\n"%funcname)
for a in arguments:
! fp.write("\t\t%s : %s,\n"%(`identify(a[0])`, `ascii(a[1])`))
fp.write("\t}\n\n")
--- 453,457 ----
fp.write("\t_argmap_%s = {\n"%funcname)
for a in arguments:
! fp.write("\t\t%s : %s,\n"%(`identify(a[0])`, `a[1]`))
fp.write("\t}\n\n")
***************
*** 475,479 ****
# available documentation, due to our name-remaping)
#
! fp.write('\t\t"""%s: %s\n'%(ascii(name), ascii(desc)))
if has_arg:
fp.write("\t\tRequired argument: %s\n"%getdatadoc(accepts))
--- 475,479 ----
# available documentation, due to our name-remaping)
#
! fp.write('\t\t"""%s: %s\n'%(name, desc))
if has_arg:
fp.write("\t\tRequired argument: %s\n"%getdatadoc(accepts))
***************
*** 490,495 ****
# Fiddle the args so everything ends up in 'arguments' dictionary
#
! fp.write("\t\t_code = %s\n"% `ascii(code)`)
! fp.write("\t\t_subcode = %s\n\n"% `ascii(subcode)`)
#
# Do keyword name substitution
--- 490,495 ----
# Fiddle the args so everything ends up in 'arguments' dictionary
#
! fp.write("\t\t_code = %s\n"% `code`)
! fp.write("\t\t_subcode = %s\n\n"% `subcode`)
#
# Do keyword name substitution
***************
*** 519,523 ****
if ename <> '****':
fp.write("\t\taetools.enumsubst(_arguments, %s, _Enum_%s)\n" %
! (`ascii(kname)`, identify(ename)))
enumsneeded[ename] = 1
fp.write("\n")
--- 519,523 ----
if ename <> '****':
fp.write("\t\taetools.enumsubst(_arguments, %s, _Enum_%s)\n" %
! (`kname`, identify(ename)))
enumsneeded[ename] = 1
fp.write("\n")
***************
*** 722,727 ****
self.fp.write("class %s(aetools.NProperty):\n" % pname)
self.fp.write('\t"""%s - %s """\n' % (ascii(name), ascii(what[1])))
! self.fp.write("\twhich = %s\n" % `ascii(code)`)
! self.fp.write("\twant = %s\n" % `ascii(what[0])`)
self.namemappers[0].addnamecode('property', pname, code)
--- 722,727 ----
self.fp.write("class %s(aetools.NProperty):\n" % pname)
self.fp.write('\t"""%s - %s """\n' % (ascii(name), ascii(what[1])))
! self.fp.write("\twhich = %s\n" % `code`)
! self.fp.write("\twant = %s\n" % `what[0]`)
self.namemappers[0].addnamecode('property', pname, code)
***************
*** 729,733 ****
[code, keyform] = elem
if self.fp:
! self.fp.write("# element %s as %s\n" % (`ascii(code)`, ascii(keyform)))
def fillclasspropsandelems(self, cls):
--- 729,733 ----
[code, keyform] = elem
if self.fp:
! self.fp.write("# element %s as %s\n" % (`code`, keyform))
def fillclasspropsandelems(self, cls):
***************
*** 766,770 ****
if not name:
if self.fp:
! self.fp.write("# XXXX %s element %s not found!!\n"%(cname, `ascii(ecode)`))
else:
elist.append((name, ename))
--- 766,770 ----
if not name:
if self.fp:
! self.fp.write("# XXXX %s element %s not found!!\n"%(cname, `ecode`))
else:
elist.append((name, ename))
***************
*** 801,805 ****
def compileenumerator(self, item):
[name, code, desc] = item
! self.fp.write("\t%s : %s,\t# %s\n" % (`identify(name)`, `ascii(code)`, desc))
def checkforenum(self, enum):
--- 801,805 ----
def compileenumerator(self, item):
[name, code, desc] = item
! self.fp.write("\t%s : %s,\t# %s\n" % (`identify(name)`, `code`, desc))
def checkforenum(self, enum):
***************
*** 820,836 ****
self.fp.write("_classdeclarations = {\n")
for k, v in self.namemappers[0].getall('class'):
! self.fp.write("\t%s : %s,\n" % (`ascii(k)`, v))
self.fp.write("}\n")
self.fp.write("\n_propdeclarations = {\n")
for k, v in self.namemappers[0].getall('property'):
! self.fp.write("\t%s : %s,\n" % (`ascii(k)`, v))
self.fp.write("}\n")
self.fp.write("\n_compdeclarations = {\n")
for k, v in self.namemappers[0].getall('comparison'):
! self.fp.write("\t%s : %s,\n" % (`ascii(k)`, v))
self.fp.write("}\n")
self.fp.write("\n_enumdeclarations = {\n")
for k, v in self.namemappers[0].getall('enum'):
! self.fp.write("\t%s : %s,\n" % (`ascii(k)`, v))
self.fp.write("}\n")
--- 820,836 ----
self.fp.write("_classdeclarations = {\n")
for k, v in self.namemappers[0].getall('class'):
! self.fp.write("\t%s : %s,\n" % (`k`, v))
self.fp.write("}\n")
self.fp.write("\n_propdeclarations = {\n")
for k, v in self.namemappers[0].getall('property'):
! self.fp.write("\t%s : %s,\n" % (`k`, v))
self.fp.write("}\n")
self.fp.write("\n_compdeclarations = {\n")
for k, v in self.namemappers[0].getall('comparison'):
! self.fp.write("\t%s : %s,\n" % (`k`, v))
self.fp.write("}\n")
self.fp.write("\n_enumdeclarations = {\n")
for k, v in self.namemappers[0].getall('enum'):
! self.fp.write("\t%s : %s,\n" % (`k`, v))
self.fp.write("}\n")
***************
*** 856,860 ****
if type == 'obj ':
return 'an AE object reference'
! return "undocumented, typecode %s"%`ascii(type)`
dataflagdict = {15: "optional", 14: "list", 13: "enum", 12: "mutable"}
--- 856,860 ----
if type == 'obj ':
return 'an AE object reference'
! return "undocumented, typecode %s"%`type`
dataflagdict = {15: "optional", 14: "list", 13: "enum", 12: "mutable"}
***************
*** 878,882 ****
rv = rv + c
else:
! rv = rv + '\\x%02.2x' % ord(c)
return rv
--- 878,882 ----
rv = rv + c
else:
! rv = rv + '\\' + 'x%02.2x' % ord(c)
return rv