Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2f7f8c4

Browse files
jackjansenjackjansen
committed
Don't be over-enthusiastic with the ascii() calls: we don't need it if
the result passes through backticks.
1 parent 8b77767 commit 2f7f8c4

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

‎Mac/scripts/gensuitemodule.py‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -317,15 +317,15 @@ def compileaete(aete, resinfo, fname):
317317
fp.write("_classdeclarations = {\n")
318318
for codenamemapper in allprecompinfo:
319319
for k, v in codenamemapper.getall('class'):
320-
fp.write("\t%s : %s,\n" % (`ascii(k)`, v))
320+
fp.write("\t%s : %s,\n" % (`k`, v))
321321
fp.write("}\n")
322322

323323
if suitelist:
324324
fp.write("\n\nclass %s(%s_Events"%(packagename, suitelist[0][1]))
325325
for code, modname in suitelist[1:]:
326326
fp.write(",\n\t\t%s_Events"%modname)
327327
fp.write(",\n\t\taetools.TalkTo):\n")
328-
fp.write("\t_signature = %s\n\n"%`ascii(creatorsignature)`)
328+
fp.write("\t_signature = %s\n\n"%`creatorsignature`)
329329
fp.write("\t_moduleName = '%s'\n\n"%packagename)
330330
fp.close()
331331

@@ -393,7 +393,7 @@ def compilesuite((suite, fss, modname), major, minor, language, script, fname, b
393393

394394
fp.write('import aetools\n')
395395
fp.write('import MacOS\n\n')
396-
fp.write("_code = %s\n\n"% `ascii(code)`)
396+
fp.write("_code = %s\n\n"% `code`)
397397
if basepackage and basepackage._code_to_module.has_key(code):
398398
# We are an extension of a baseclass (usually an application extending
399399
# Standard_Suite or so). Import everything from our base module
@@ -452,7 +452,7 @@ def compileevent(fp, event, enumsneeded):
452452
if arguments:
453453
fp.write("\t_argmap_%s = {\n"%funcname)
454454
for a in arguments:
455-
fp.write("\t\t%s : %s,\n"%(`identify(a[0])`, `ascii(a[1])`))
455+
fp.write("\t\t%s : %s,\n"%(`identify(a[0])`, `a[1]`))
456456
fp.write("\t}\n\n")
457457

458458
#
@@ -474,7 +474,7 @@ def compileevent(fp, event, enumsneeded):
474474
# Generate doc string (important, since it may be the only
475475
# available documentation, due to our name-remaping)
476476
#
477-
fp.write('\t\t"""%s: %s\n'%(ascii(name), ascii(desc)))
477+
fp.write('\t\t"""%s: %s\n'%(name, desc))
478478
if has_arg:
479479
fp.write("\t\tRequired argument: %s\n"%getdatadoc(accepts))
480480
elif opt_arg:
@@ -489,8 +489,8 @@ def compileevent(fp, event, enumsneeded):
489489
#
490490
# Fiddle the args so everything ends up in 'arguments' dictionary
491491
#
492-
fp.write("\t\t_code = %s\n"% `ascii(code)`)
493-
fp.write("\t\t_subcode = %s\n\n"% `ascii(subcode)`)
492+
fp.write("\t\t_code = %s\n"% `code`)
493+
fp.write("\t\t_subcode = %s\n\n"% `subcode`)
494494
#
495495
# Do keyword name substitution
496496
#
@@ -518,7 +518,7 @@ def compileevent(fp, event, enumsneeded):
518518
ename = a[2][0]
519519
if ename <> '****':
520520
fp.write("\t\taetools.enumsubst(_arguments, %s, _Enum_%s)\n" %
521-
(`ascii(kname)`, identify(ename)))
521+
(`kname`, identify(ename)))
522522
enumsneeded[ename] = 1
523523
fp.write("\n")
524524
#
@@ -721,14 +721,14 @@ def compileproperty(self, prop):
721721
if self.fp:
722722
self.fp.write("class %s(aetools.NProperty):\n" % pname)
723723
self.fp.write('\t"""%s - %s """\n' % (ascii(name), ascii(what[1])))
724-
self.fp.write("\twhich = %s\n" % `ascii(code)`)
725-
self.fp.write("\twant = %s\n" % `ascii(what[0])`)
724+
self.fp.write("\twhich = %s\n" % `code`)
725+
self.fp.write("\twant = %s\n" % `what[0]`)
726726
self.namemappers[0].addnamecode('property', pname, code)
727727

728728
def compileelement(self, elem):
729729
[code, keyform] = elem
730730
if self.fp:
731-
self.fp.write("# element %s as %s\n" % (`ascii(code)`, ascii(keyform)))
731+
self.fp.write("# element %s as %s\n" % (`code`, keyform))
732732

733733
def fillclasspropsandelems(self, cls):
734734
[name, code, desc, properties, elements] = cls
@@ -765,7 +765,7 @@ def fillclasspropsandelems(self, cls):
765765
name, ename, module = self.findcodename('class', ecode)
766766
if not name:
767767
if self.fp:
768-
self.fp.write("# XXXX %s element %s not found!!\n"%(cname, `ascii(ecode)`))
768+
self.fp.write("# XXXX %s element %s not found!!\n"%(cname, `ecode`))
769769
else:
770770
elist.append((name, ename))
771771

@@ -800,7 +800,7 @@ def compileenumeration(self, enum):
800800

801801
def compileenumerator(self, item):
802802
[name, code, desc] = item
803-
self.fp.write("\t%s : %s,\t# %s\n" % (`identify(name)`, `ascii(code)`, desc))
803+
self.fp.write("\t%s : %s,\t# %s\n" % (`identify(name)`, `code`, desc))
804804

805805
def checkforenum(self, enum):
806806
"""This enum code is used by an event. Make sure it's available"""
@@ -819,19 +819,19 @@ def dumpindex(self):
819819
self.fp.write("\n#\n# Indices of types declared in this module\n#\n")
820820
self.fp.write("_classdeclarations = {\n")
821821
for k, v in self.namemappers[0].getall('class'):
822-
self.fp.write("\t%s : %s,\n" % (`ascii(k)`, v))
822+
self.fp.write("\t%s : %s,\n" % (`k`, v))
823823
self.fp.write("}\n")
824824
self.fp.write("\n_propdeclarations = {\n")
825825
for k, v in self.namemappers[0].getall('property'):
826-
self.fp.write("\t%s : %s,\n" % (`ascii(k)`, v))
826+
self.fp.write("\t%s : %s,\n" % (`k`, v))
827827
self.fp.write("}\n")
828828
self.fp.write("\n_compdeclarations = {\n")
829829
for k, v in self.namemappers[0].getall('comparison'):
830-
self.fp.write("\t%s : %s,\n" % (`ascii(k)`, v))
830+
self.fp.write("\t%s : %s,\n" % (`k`, v))
831831
self.fp.write("}\n")
832832
self.fp.write("\n_enumdeclarations = {\n")
833833
for k, v in self.namemappers[0].getall('enum'):
834-
self.fp.write("\t%s : %s,\n" % (`ascii(k)`, v))
834+
self.fp.write("\t%s : %s,\n" % (`k`, v))
835835
self.fp.write("}\n")
836836

837837
def compiledata(data):
@@ -855,7 +855,7 @@ def getdatadoc(data):
855855
return 'anything'
856856
if type == 'obj ':
857857
return 'an AE object reference'
858-
return "undocumented, typecode %s"%`ascii(type)`
858+
return "undocumented, typecode %s"%`type`
859859

860860
dataflagdict = {15: "optional", 14: "list", 13: "enum", 12: "mutable"}
861861
def compiledataflags(flags):
@@ -877,7 +877,7 @@ def ascii(str):
877877
if c in ('\t', '\n', '\r') or ' ' <= c < chr(0x7f):
878878
rv = rv + c
879879
else:
880-
rv = rv + '\\x%02.2x' % ord(c)
880+
rv = rv + '\\' + 'x%02.2x' % ord(c)
881881
return rv
882882

883883
def identify(str):

0 commit comments

Comments
 (0)