logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

py2.patch (18235B)

    

  1. SPDX-FileCopyrightText: 2022 fosslinux <fosslinux@aussies.space>
  3. SPDX-License-Identifier: PSF-2.0
  5. We are building Python 3 using Python 2 as our bootstrap. But
  6. makeunicodedata has been converted to Python 3. We need to
  7. convert back, particularly print statements, and writing to
  8. files.
  10. We only apply this to the first build.
  12. --- Python-3.1.5/Tools/unicode/makeunicodedata.py	2012-04-10 09:25:37.000000000 +1000
  13. +++ Python-3.1.5/Tools/unicode/makeunicodedata.py	2022-07-13 14:13:37.864821008 +1000
  14. @@ -67,7 +67,7 @@
  15.  
  16.  def maketables(trace=0):
  17.  
  18. -    print("--- Reading", UNICODE_DATA % "", "...")
  19. +    print "--- Reading", UNICODE_DATA % "", "..."
  20.  
  21.      version = ""
  22.      unicode = UnicodeData(UNICODE_DATA % version,
  23. @@ -76,15 +76,15 @@
  24.                            DERIVED_CORE_PROPERTIES % version,
  25.                            DERIVEDNORMALIZATION_PROPS % version)
  26.  
  27. -    print(len(list(filter(None, unicode.table))), "characters")
  28. +    print len(list(filter(None, unicode.table))), "characters"
  29.  
  30.      for version in old_versions:
  31. -        print("--- Reading", UNICODE_DATA % ("-"+version), "...")
  32. +        print "--- Reading", UNICODE_DATA % ("-"+version) + "..."
  33.          old_unicode = UnicodeData(UNICODE_DATA % ("-"+version),
  34.                                    COMPOSITION_EXCLUSIONS % ("-"+version),
  35.                                    EASTASIAN_WIDTH % ("-"+version),
  36.                                    DERIVED_CORE_PROPERTIES % ("-"+version))
  37. -        print(len(list(filter(None, old_unicode.table))), "characters")
  38. +        print len(list(filter(None, old_unicode.table))), "characters"
  39.          merge_old_version(version, unicode, old_unicode)
  40.  
  41.      makeunicodename(unicode, trace)
  42. @@ -103,7 +103,7 @@
  43.  
  44.      FILE = "Modules/unicodedata_db.h"
  45.  
  46. -    print("--- Preparing", FILE, "...")
  47. +    print "--- Preparing", FILE, "..."
  48.  
  49.      # 1) database properties
  50.  
  51. @@ -214,92 +214,90 @@
  52.          l = comp_last[l]
  53.          comp_data[f*total_last+l] = char
  54.  
  55. -    print(len(table), "unique properties")
  56. -    print(len(decomp_prefix), "unique decomposition prefixes")
  57. -    print(len(decomp_data), "unique decomposition entries:", end=' ')
  58. -    print(decomp_size, "bytes")
  59. -    print(total_first, "first characters in NFC")
  60. -    print(total_last, "last characters in NFC")
  61. -    print(len(comp_pairs), "NFC pairs")
  62. +    print len(table), "unique properties"
  63. +    print len(decomp_prefix), "unique decomposition prefixes"
  64. +    print len(decomp_data), "unique decomposition entries:",
  65. +    print decomp_size, "bytes"
  66. +    print total_first, "first characters in NFC"
  67. +    print total_last, "last characters in NFC"
  68. +    print len(comp_pairs), "NFC pairs"
  69.  
  70. -    print("--- Writing", FILE, "...")
  71. +    print "--- Writing", FILE, "..."
  72.  
  73.      fp = open(FILE, "w")
  74. -    print("/* this file was generated by %s %s */" % (SCRIPT, VERSION), file=fp)
  75. -    print(file=fp)
  76. -    print('#define UNIDATA_VERSION "%s"' % UNIDATA_VERSION, file=fp)
  77. -    print("/* a list of unique database records */", file=fp)
  78. -    print("const _PyUnicode_DatabaseRecord _PyUnicode_Database_Records[] = {", file=fp)
  79. +    fp.write("/* this file was generated by %s %s */\n\n" % (SCRIPT, VERSION))
  80. +    fp.write('#define UNIDATA_VERSION "%s"\n' % UNIDATA_VERSION)
  81. +    fp.write("/* a list of unique database records */\n")
  82. +    fp.write("const _PyUnicode_DatabaseRecord _PyUnicode_Database_Records[] = {\n")
  83.      for item in table:
  84. -        print("    {%d, %d, %d, %d, %d, %d}," % item, file=fp)
  85. -    print("};", file=fp)
  86. -    print(file=fp)
  87. -
  88. -    print("/* Reindexing of NFC first characters. */", file=fp)
  89. -    print("#define TOTAL_FIRST",total_first, file=fp)
  90. -    print("#define TOTAL_LAST",total_last, file=fp)
  91. -    print("struct reindex{int start;short count,index;};", file=fp)
  92. -    print("static struct reindex nfc_first[] = {", file=fp)
  93. +        fp.write("    {%d, %d, %d, %d, %d, %d},\n" % item)
  94. +    fp.write("};\n\n")
  95. +
  96. +    fp.write("/* Reindexing of NFC first characters. */\n")
  97. +    fp.write("#define TOTAL_FIRST %d \n" % total_first)
  98. +    fp.write("#define TOTAL_LAST %d \n" % total_last)
  99. +    fp.write("struct reindex{int start;short count,index;};\n")
  100. +    fp.write("static struct reindex nfc_first[] = {\n")
  101.      for start,end in comp_first_ranges:
  102. -        print("  { %d, %d, %d}," % (start,end-start,comp_first[start]), file=fp)
  103. -    print("  {0,0,0}", file=fp)
  104. -    print("};\n", file=fp)
  105. -    print("static struct reindex nfc_last[] = {", file=fp)
  106. +        fp.write("  { %d, %d, %d},\n" % (start,end-start,comp_first[start]))
  107. +    fp.write("  {0,0,0}\n")
  108. +    fp.write("};\n")
  109. +    fp.write("static struct reindex nfc_last[] = {\n")
  110.      for start,end in comp_last_ranges:
  111. -        print("  { %d, %d, %d}," % (start,end-start,comp_last[start]), file=fp)
  112. -    print("  {0,0,0}", file=fp)
  113. -    print("};\n", file=fp)
  114. +        fp.write("  { %d, %d, %d},\n" % (start,end-start,comp_last[start]))
  115. +    fp.write("  {0,0,0}\n")
  116. +    fp.write("};\n")
  117.  
  118.      # FIXME: <fl> the following tables could be made static, and
  119.      # the support code moved into unicodedatabase.c
  120.  
  121. -    print("/* string literals */", file=fp)
  122. -    print("const char *_PyUnicode_CategoryNames[] = {", file=fp)
  123. +    fp.write("/* string literals */")
  124. +    fp.write("const char *_PyUnicode_CategoryNames[] = {")
  125.      for name in CATEGORY_NAMES:
  126. -        print("    \"%s\"," % name, file=fp)
  127. -    print("    NULL", file=fp)
  128. -    print("};", file=fp)
  129. +        fp.write("    \"%s\",\n" % name)
  130. +    fp.write("    NULL\n")
  131. +    fp.write("};\n")
  132.  
  133. -    print("const char *_PyUnicode_BidirectionalNames[] = {", file=fp)
  134. +    fp.write("const char *_PyUnicode_BidirectionalNames[] = {\n")
  135.      for name in BIDIRECTIONAL_NAMES:
  136. -        print("    \"%s\"," % name, file=fp)
  137. -    print("    NULL", file=fp)
  138. -    print("};", file=fp)
  139. +        fp.write("    \"%s\",\n" % name)
  140. +    fp.write("    NULL\n")
  141. +    fp.write("};\n")
  142.  
  143. -    print("const char *_PyUnicode_EastAsianWidthNames[] = {", file=fp)
  144. +    fp.write("const char *_PyUnicode_EastAsianWidthNames[] = {\n")
  145.      for name in EASTASIANWIDTH_NAMES:
  146. -        print("    \"%s\"," % name, file=fp)
  147. -    print("    NULL", file=fp)
  148. -    print("};", file=fp)
  149. +        fp.write("    \"%s\",\n" % name)
  150. +    fp.write("    NULL\n")
  151. +    fp.write("};\n")
  152.  
  153. -    print("static const char *decomp_prefix[] = {", file=fp)
  154. +    fp.write("static const char *decomp_prefix[] = {\n")
  155.      for name in decomp_prefix:
  156. -        print("    \"%s\"," % name, file=fp)
  157. -    print("    NULL", file=fp)
  158. -    print("};", file=fp)
  159. +        fp.write("    \"%s\",\n" % name)
  160. +    fp.write("    NULL\n")
  161. +    fp.write("};\n")
  162.  
  163.      # split record index table
  164.      index1, index2, shift = splitbins(index, trace)
  165.  
  166. -    print("/* index tables for the database records */", file=fp)
  167. -    print("#define SHIFT", shift, file=fp)
  168. +    fp.write("/* index tables for the database records */\n")
  169. +    fp.write("#define SHIFT %d\n" % shift)
  170.      Array("index1", index1).dump(fp, trace)
  171.      Array("index2", index2).dump(fp, trace)
  172.  
  173.      # split decomposition index table
  174.      index1, index2, shift = splitbins(decomp_index, trace)
  175.  
  176. -    print("/* decomposition data */", file=fp)
  177. +    fp.write("/* decomposition data */\n")
  178.      Array("decomp_data", decomp_data).dump(fp, trace)
  179.  
  180. -    print("/* index tables for the decomposition data */", file=fp)
  181. -    print("#define DECOMP_SHIFT", shift, file=fp)
  182. +    fp.write("/* index tables for the decomposition data */\n")
  183. +    fp.write("#define DECOMP_SHIFT %d\n" % shift)
  184.      Array("decomp_index1", index1).dump(fp, trace)
  185.      Array("decomp_index2", index2).dump(fp, trace)
  186.  
  187.      index, index2, shift = splitbins(comp_data, trace)
  188. -    print("/* NFC pairs */", file=fp)
  189. -    print("#define COMP_SHIFT", shift, file=fp)
  190. +    fp.write("/* NFC pairs */\n")
  191. +    fp.write("#define COMP_SHIFT %d\n" % shift)
  192.      Array("comp_index", index).dump(fp, trace)
  193.      Array("comp_data", index2).dump(fp, trace)
  194.  
  195. @@ -316,30 +314,30 @@
  196.                  index[i] = cache[record] = len(records)
  197.                  records.append(record)
  198.          index1, index2, shift = splitbins(index, trace)
  199. -        print("static const change_record change_records_%s[] = {" % cversion, file=fp)
  200. +        fp.write("static const change_record change_records_%s[] = {\n" % cversion)
  201.          for record in records:
  202. -            print("\t{ %s }," % ", ".join(map(str,record)), file=fp)
  203. -        print("};", file=fp)
  204. -        Array("changes_%s_index" % cversion, index1).dump(fp, trace)
  205. -        Array("changes_%s_data" % cversion, index2).dump(fp, trace)
  206. -        print("static const change_record* get_change_%s(Py_UCS4 n)" % cversion, file=fp)
  207. -        print("{", file=fp)
  208. -        print("\tint index;", file=fp)
  209. -        print("\tif (n >= 0x110000) index = 0;", file=fp)
  210. -        print("\telse {", file=fp)
  211. -        print("\t\tindex = changes_%s_index[n>>%d];" % (cversion, shift), file=fp)
  212. -        print("\t\tindex = changes_%s_data[(index<<%d)+(n & %d)];" % \
  213. -              (cversion, shift, ((1<<shift)-1)), file=fp)
  214. -        print("\t}", file=fp)
  215. -        print("\treturn change_records_%s+index;" % cversion, file=fp)
  216. -        print("}\n", file=fp)
  217. -        print("static Py_UCS4 normalization_%s(Py_UCS4 n)" % cversion, file=fp)
  218. -        print("{", file=fp)
  219. -        print("\tswitch(n) {", file=fp)
  220. +            fp.write("\t{ %s },\n" % ", ".join(map(str,record)))
  221. +        fp.write("};\n")
  222. +        Array("changes_%s_index\n" % cversion, index1).dump(fp, trace)
  223. +        Array("changes_%s_data\n" % cversion, index2).dump(fp, trace)
  224. +        fp.write("static const change_record* get_change_%s(Py_UCS4 n)\n" % cversion)
  225. +        fp.write("{\n")
  226. +        fp.write("\tint index;\n")
  227. +        fp.write("\tif (n >= 0x110000) index = 0;\n")
  228. +        fp.write("\telse {\n")
  229. +        fp.write("\t\tindex = changes_%s_index[n>>%d];\n" % (cversion, shift))
  230. +        fp.write("\t\tindex = changes_%s_data[(index<<%d)+(n & %d)];\n" % \
  231. +              (cversion, shift, ((1<<shift)-1)))
  232. +        fp.write("\t}\n")
  233. +        fp.write("\treturn change_records_%s+index;\n" % cversion)
  234. +        fp.write("}\n\n")
  235. +        fp.write("static Py_UCS4 normalization_%s(Py_UCS4 n)\n" % cversion)
  236. +        fp.write("{\n")
  237. +        fp.write("\tswitch(n) {\n")
  238.          for k, v in normalization:
  239. -            print("\tcase %s: return 0x%s;" % (hex(k), v), file=fp)
  240. -        print("\tdefault: return 0;", file=fp)
  241. -        print("\t}\n}\n", file=fp)
  242. +            fp.write("\tcase %s: return 0x%s;\n" % (hex(k), v))
  243. +        fp.write("\tdefault: return 0;\n")
  244. +        fp.write("\t}\n}\n\n")
  245.  
  246.      fp.close()
  247.  
  248. @@ -350,7 +348,7 @@
  249.  
  250.      FILE = "Objects/unicodetype_db.h"
  251.  
  252. -    print("--- Preparing", FILE, "...")
  253. +    print "--- Preparing", FILE, "..."
  254.  
  255.      # extract unicode types
  256.      dummy = (0, 0, 0, 0, 0, 0)
  257. @@ -433,25 +431,25 @@
  258.                  table.append(item)
  259.              index[char] = i
  260.  
  261. -    print(len(table), "unique character type entries")
  262. +    print len(table), "unique character type entries"
  263.  
  264. -    print("--- Writing", FILE, "...")
  265. +    print "--- Writing", FILE, "..."
  266.  
  267.      fp = open(FILE, "w")
  268. -    print("/* this file was generated by %s %s */" % (SCRIPT, VERSION), file=fp)
  269. -    print(file=fp)
  270. -    print("/* a list of unique character type descriptors */", file=fp)
  271. -    print("const _PyUnicode_TypeRecord _PyUnicode_TypeRecords[] = {", file=fp)
  272. +    fp.write("/* this file was generated by %s %s */\n" % (SCRIPT, VERSION))
  273. +    fp.write("\n")
  274. +    fp.write("/* a list of unique character type descriptors */\n")
  275. +    fp.write("const _PyUnicode_TypeRecord _PyUnicode_TypeRecords[] = {\n")
  276.      for item in table:
  277. -        print("    {%d, %d, %d, %d, %d, %d}," % item, file=fp)
  278. -    print("};", file=fp)
  279. -    print(file=fp)
  280. +        fp.write("    {%d, %d, %d, %d, %d, %d},\n" % item)
  281. +    fp.write("};\n")
  282. +    fp.write("\n")
  283.  
  284.      # split decomposition index table
  285.      index1, index2, shift = splitbins(index, trace)
  286.  
  287. -    print("/* type indexes */", file=fp)
  288. -    print("#define SHIFT", shift, file=fp)
  289. +    fp.write("/* type indexes */\n")
  290. +    fp.write("#define SHIFT %d\n" % shift)
  291.      Array("index1", index1).dump(fp, trace)
  292.      Array("index2", index2).dump(fp, trace)
  293.  
  294. @@ -464,7 +462,7 @@
  295.  
  296.      FILE = "Modules/unicodename_db.h"
  297.  
  298. -    print("--- Preparing", FILE, "...")
  299. +    print "--- Preparing", FILE, "..."
  300.  
  301.      # collect names
  302.      names = [None] * len(unicode.chars)
  303. @@ -476,7 +474,7 @@
  304.              if name and name[0] != "<":
  305.                  names[char] = name + chr(0)
  306.  
  307. -    print(len(list(n for n in names if n is not None)), "distinct names")
  308. +    print len(list(n for n in names if n is not None)), "distinct names"
  309.  
  310.      # collect unique words from names (note that we differ between
  311.      # words inside a sentence, and words ending a sentence.  the
  312. @@ -497,7 +495,7 @@
  313.                  else:
  314.                      words[w] = [len(words)]
  315.  
  316. -    print(n, "words in text;", b, "bytes")
  317. +    print n, "words in text;", b, "bytes"
  318.  
  319.      wordlist = list(words.items())
  320.  
  321. @@ -511,19 +509,19 @@
  322.      escapes = 0
  323.      while escapes * 256 < len(wordlist):
  324.          escapes = escapes + 1
  325. -    print(escapes, "escapes")
  326. +    print escapes, "escapes"
  327.  
  328.      short = 256 - escapes
  329.  
  330.      assert short > 0
  331.  
  332. -    print(short, "short indexes in lexicon")
  333. +    print short, "short indexes in lexicon"
  334.  
  335.      # statistics
  336.      n = 0
  337.      for i in range(short):
  338.          n = n + len(wordlist[i][1])
  339. -    print(n, "short indexes in phrasebook")
  340. +    print n, "short indexes in phrasebook"
  341.  
  342.      # pick the most commonly used words, and sort the rest on falling
  343.      # length (to maximize overlap)
  344. @@ -592,29 +590,29 @@
  345.  
  346.      codehash = Hash("code", data, 47)
  347.  
  348. -    print("--- Writing", FILE, "...")
  349. +    print "--- Writing", FILE, "..."
  350.  
  351.      fp = open(FILE, "w")
  352. -    print("/* this file was generated by %s %s */" % (SCRIPT, VERSION), file=fp)
  353. -    print(file=fp)
  354. -    print("#define NAME_MAXLEN", 256, file=fp)
  355. -    print(file=fp)
  356. -    print("/* lexicon */", file=fp)
  357. +    fp.write("/* this file was generated by %s %s */\n" % (SCRIPT, VERSION))
  358. +    fp.write("\n")
  359. +    fp.write("#define NAME_MAXLEN 256")
  360. +    fp.write("\n")
  361. +    fp.write("/* lexicon */\n")
  362.      Array("lexicon", lexicon).dump(fp, trace)
  363.      Array("lexicon_offset", lexicon_offset).dump(fp, trace)
  364.  
  365.      # split decomposition index table
  366.      offset1, offset2, shift = splitbins(phrasebook_offset, trace)
  367.  
  368. -    print("/* code->name phrasebook */", file=fp)
  369. -    print("#define phrasebook_shift", shift, file=fp)
  370. -    print("#define phrasebook_short", short, file=fp)
  371. +    fp.write("/* code->name phrasebook */\n")
  372. +    fp.write("#define phrasebook_shift %d\n" % shift)
  373. +    fp.write("#define phrasebook_short %d\n" % short)
  374.  
  375.      Array("phrasebook", phrasebook).dump(fp, trace)
  376.      Array("phrasebook_offset1", offset1).dump(fp, trace)
  377.      Array("phrasebook_offset2", offset2).dump(fp, trace)
  378.  
  379. -    print("/* name->code dictionary */", file=fp)
  380. +    fp.write("/* name->code dictionary */\n")
  381.      codehash.dump(fp, trace)
  382.  
  383.      fp.close()
  384. @@ -868,7 +866,7 @@
  385.          else:
  386.              raise AssertionError("ran out of polynomials")
  387.  
  388. -        print(size, "slots in hash table")
  389. +        print size, "slots in hash table"
  390.  
  391.          table = [None] * size
  392.  
  393. @@ -900,7 +898,7 @@
  394.                  if incr > mask:
  395.                      incr = incr ^ poly
  396.  
  397. -        print(n, "collisions")
  398. +        print n, "collisions"
  399.          self.collisions = n
  400.  
  401.          for i in range(len(table)):
  402. @@ -931,8 +929,6 @@
  403.      def dump(self, file, trace=0):
  404.          # write data to file, as a C array
  405.          size = getsize(self.data)
  406. -        if trace:
  407. -            print(self.name+":", size*len(self.data), "bytes", file=sys.stderr)
  408.          file.write("static ")
  409.          if size == 1:
  410.              file.write("unsigned char")
  411. @@ -980,12 +976,6 @@
  412.      """
  413.  
  414.      import sys
  415. -    if trace:
  416. -        def dump(t1, t2, shift, bytes):
  417. -            print("%d+%d bins at shift %d; %d bytes" % (
  418. -                len(t1), len(t2), shift, bytes), file=sys.stderr)
  419. -        print("Size of original table:", len(t)*getsize(t), \
  420. -                            "bytes", file=sys.stderr)
  421.      n = len(t)-1    # last valid index
  422.      maxshift = 0    # the most we can shift n and still have something left
  423.      if n > 0:
  424. @@ -993,7 +983,7 @@
  425.              n >>= 1
  426.              maxshift += 1
  427.      del n
  428. -    bytes = sys.maxsize  # smallest total size so far
  429. +    bytes_size = 2**31 - 1  # smallest total size so far
  430.      t = tuple(t)    # so slices can be dict keys
  431.      for shift in range(maxshift + 1):
  432.          t1 = []
  433. @@ -1010,15 +1000,10 @@
  434.              t1.append(index >> shift)
  435.          # determine memory size
  436.          b = len(t1)*getsize(t1) + len(t2)*getsize(t2)
  437. -        if trace > 1:
  438. -            dump(t1, t2, shift, b)
  439. -        if b < bytes:
  440. +        if b < bytes_size:
  441.              best = t1, t2, shift
  442. -            bytes = b
  443. +            bytes_size = b
  444.      t1, t2, shift = best
  445. -    if trace:
  446. -        print("Best:", end=' ', file=sys.stderr)
  447. -        dump(t1, t2, shift, bytes)
  448.      if __debug__:
  449.          # exhaustively verify that the decomposition is correct
  450.          mask = ~((~0) << shift) # i.e., low-bit mask of shift bits
  451. --- Python-3.1.5/Lib/token.py	2012-04-10 09:25:36.000000000 +1000
  452. +++ Python-3.1.5/Lib/token.py	2022-07-13 14:13:37.893821468 +1000
  453. @@ -93,11 +93,7 @@
  454.      outFileName = "Lib/token.py"
  455.      if len(args) > 1:
  456.          outFileName = args[1]
  457. -    try:
  458. -        fp = open(inFileName)
  459. -    except IOError as err:
  460. -        sys.stdout.write("I/O error: %s\n" % str(err))
  461. -        sys.exit(1)
  462. +    fp = open(inFileName)
  463.      lines = fp.read().split("\n")
  464.      fp.close()
  465.      prog = re.compile(
  466. @@ -114,7 +110,7 @@
  467.      # load the output skeleton from the target:
  468.      try:
  469.          fp = open(outFileName)
  470. -    except IOError as err:
  471. +    except IOError:
  472.          sys.stderr.write("I/O error: %s\n" % str(err))
  473.          sys.exit(2)
  474.      format = fp.read().split("\n")
  475. @@ -131,7 +127,7 @@
  476.      format[start:end] = lines
  477.      try:
  478.          fp = open(outFileName, 'w')
  479. -    except IOError as err:
  480. +    except IOError:
  481.          sys.stderr.write("I/O error: %s\n" % str(err))
  482.          sys.exit(4)
  483.      fp.write("\n".join(format))