@port-labs/jq-node-bindings 1.0.4 → 1.1.0-dev

package/deps/jq/{modules → vendor}/oniguruma/install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2020-11-14.01; # UTC
+scriptversion=2025-06-18.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -124,9 +124,9 @@ it's up to you to specify -f if you want it.
 
 If -S is not specified, no backups are attempted.
 
-Email bug reports to bug-automake@gnu.org.
-Automake home page: https://www.gnu.org/software/automake/
-"
+Report bugs to <bug-automake@gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>."
 
 while test $# -ne 0; do
   case $1 in
@@ -170,7 +170,7 @@ while test $# -ne 0; do
 
     -T) is_target_a_directory=never;;
 
-    --version) echo "$0 $scriptversion"; exit $?;;
+    --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;;
 
     --) shift
         break;;
@@ -345,7 +345,7 @@ do
 	' 0
 
 	# Because "mkdir -p" follows existing symlinks and we likely work
-	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directly in world-writable /tmp, make sure that the '$tmpdir'
 	# directory is successfully created first before we actually test
 	# 'mkdir -p'.
 	if (umask $mkdir_umask &&
@@ -353,7 +353,7 @@ do
 	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
 	then
 	  if test -z "$dir_arg" || {
-	       # Check for POSIX incompatibilities with -m.
+	       # Check for POSIX incompatibility with -m.
 	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 	       # other-writable bit of parent directory when it shouldn't.
 	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
@@ -533,9 +533,9 @@ do
 done
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

package/deps/jq/{modules → vendor}/oniguruma/missing

@@ -1,9 +1,11 @@
 #! /bin/sh
-# Common wrapper for a few potentially missing GNU programs.
+# Common wrapper for a few potentially missing GNU and other programs.
 
-scriptversion=2018-03-07.03; # UTC
+scriptversion=2025-06-18.21; # UTC
 
-# Copyright (C) 1996-2021 Free Software Foundation, Inc.
+# shellcheck disable=SC2006,SC2268 # we must support pre-POSIX shells
+
+# Copyright (C) 1996-2025 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -54,18 +56,20 @@ Options:
   -v, --version   output version information and exit
 
 Supported PROGRAM values:
-  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
-  bison     yacc      flex         lex       help2man
+aclocal autoconf autogen  autoheader autom4te automake autoreconf
+bison   flex     help2man lex        makeinfo perl     yacc
 
 Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
 'g' are ignored when checking the name.
 
-Send bug reports to <bug-automake@gnu.org>."
+Report bugs to <bug-automake@gnu.org>.
+GNU Automake home page: <https://www.gnu.org/software/automake/>.
+General help using GNU software: <https://www.gnu.org/gethelp/>."
     exit $?
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
+    echo "missing (GNU Automake) $scriptversion"
     exit $?
     ;;
 
@@ -108,7 +112,7 @@ gnu_software_URL=https://www.gnu.org/software
 program_details ()
 {
   case $1 in
-    aclocal|automake)
+    aclocal|automake|autoreconf)
       echo "The '$1' program is part of the GNU Automake package:"
       echo "<$gnu_software_URL/automake>"
       echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
@@ -123,6 +127,9 @@ program_details ()
       echo "<$gnu_software_URL/m4/>"
       echo "<$perl_URL>"
       ;;
+    *)
+      :
+      ;;
   esac
 }
 
@@ -137,48 +144,55 @@ give_advice ()
   printf '%s\n' "'$1' is $msg."
 
   configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  autoheader_deps="'acconfig.h'"
+  automake_deps="'Makefile.am'"
+  aclocal_deps="'acinclude.m4'"
   case $normalized_program in
+    aclocal*)
+      echo "You should only need it if you modified $aclocal_deps or"
+      echo "$configure_deps."
+      ;;
     autoconf*)
-      echo "You should only need it if you modified 'configure.ac',"
-      echo "or m4 files included by it."
-      program_details 'autoconf'
+      echo "You should only need it if you modified $configure_deps."
+      ;;
+    autogen*)
+      echo "You should only need it if you modified a '.def' or '.tpl' file."
+      echo "You may want to install the GNU AutoGen package:"
+      echo "<$gnu_software_URL/autogen/>"
       ;;
     autoheader*)
-      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "You should only need it if you modified $autoheader_deps or"
       echo "$configure_deps."
-      program_details 'autoheader'
       ;;
     automake*)
-      echo "You should only need it if you modified 'Makefile.am' or"
-      echo "$configure_deps."
-      program_details 'automake'
-      ;;
-    aclocal*)
-      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "You should only need it if you modified $automake_deps or"
       echo "$configure_deps."
-      program_details 'aclocal'
       ;;
-   autom4te*)
+    autom4te*)
       echo "You might have modified some maintainer files that require"
       echo "the 'autom4te' program to be rebuilt."
-      program_details 'autom4te'
+      ;;
+    autoreconf*)
+      echo "You should only need it if you modified $aclocal_deps or"
+      echo "$automake_deps or $autoheader_deps or $automake_deps or"
+      echo "$configure_deps."
       ;;
     bison*|yacc*)
       echo "You should only need it if you modified a '.y' file."
       echo "You may want to install the GNU Bison package:"
       echo "<$gnu_software_URL/bison/>"
       ;;
-    lex*|flex*)
-      echo "You should only need it if you modified a '.l' file."
-      echo "You may want to install the Fast Lexical Analyzer package:"
-      echo "<$flex_URL>"
-      ;;
     help2man*)
       echo "You should only need it if you modified a dependency" \
            "of a man page."
       echo "You may want to install the GNU Help2man package:"
       echo "<$gnu_software_URL/help2man/>"
     ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
     makeinfo*)
       echo "You should only need it if you modified a '.texi' file, or"
       echo "any other file indirectly affecting the aspect of the manual."
@@ -189,6 +203,12 @@ give_advice ()
       echo "want to install GNU make:"
       echo "<$gnu_software_URL/make/>"
       ;;
+    perl*)
+      echo "You should only need it to run GNU Autoconf, GNU Automake, "
+      echo "  assorted other tools, or if you modified a Perl source file."
+      echo "You may want to install the Perl 5 language interpreter:"
+      echo "<$perl_URL>"
+      ;;
     *)
       echo "You might have modified some files without having the proper"
       echo "tools for further handling them.  Check the 'README' file, it"
@@ -197,6 +217,7 @@ give_advice ()
       echo "case some other package contains this missing '$1' program."
       ;;
   esac
+  program_details "$normalized_program"
 }
 
 give_advice "$1" | sed -e '1s/^/WARNING: /' \
@@ -207,9 +228,9 @@ give_advice "$1" | sed -e '1s/^/WARNING: /' \
 exit $st
 
 # Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp nil t)
 # time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-format: "%Y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

package/deps/jq/{modules → vendor}/oniguruma/sample/callback_each_match.c

@@ -93,7 +93,7 @@ static int
 match(UChar* pattern, UChar* str, UChar* at, OnigOptionType options, OnigOptionType runtime_options)
 {
   int r;
-  unsigned char *start, *range, *end;
+  unsigned char *end;
   regex_t* reg;
   OnigErrorInfo einfo;
   OnigRegion *region;
@@ -112,8 +112,6 @@ match(UChar* pattern, UChar* str, UChar* at, OnigOptionType options, OnigOptionT
   region = onig_region_new();
 
   end   = str + strlen((char* )str);
-  start = str;
-  range = end;
   mp = onig_new_match_param();
   if (mp == 0) return -2;
 

package/deps/jq/vendor/oniguruma/sbom.cdx.json

@@ -0,0 +1,44 @@
+{
+  "bomFormat": "CycloneDX",
+  "specVersion": "1.6",
+  "version": 1,
+  "metadata": {
+    "authors": [
+      {
+        "name": "@VCS_SBOM_AUTHORS@"
+      }
+    ]
+  },
+  "components": [
+    {
+      "type": "library",
+      "bom-ref": "pkg:github/kkos/oniguruma@@VCS_TAG@",
+      "cpe": "cpe:2.3:a:kkos:oniguruma:@VCS_TAG@:*:*:*:*:*:*:*",
+      "name": "oniguruma",
+      "version": "@VCS_VERSION@",
+      "description": "A modern and flexible regular expressions library",
+      "authors": [
+        {
+          "name": "@VCS_AUTHORS@",
+          "url": "https://raw.githubusercontent.com/kkos/oniguruma/refs/heads/master/AUTHORS"
+        }
+      ],
+      "supplier": {
+        "name": "oniguruma developers"
+      },
+      "licenses": [
+        {
+          "license": {
+            "id": "BSD-2-Clause"
+          }
+        }
+      ],
+      "externalReferences": [
+        {
+          "type": "vcs",
+          "url": "https://github.com/kkos/oniguruma"
+        }
+      ]
+    }
+  ]
+}

package/deps/jq/{modules → vendor}/oniguruma/src/ascii.c

@@ -2,7 +2,7 @@
   ascii.c -  Oniguruma (regular expression library)
 **********************************************************************/
 /*-
- * Copyright (c) 2002-2019  K.Kosako
+ * Copyright (c) 2002-2024  K.Kosako
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,6 +44,9 @@ init(void)
 
     name = "FAIL";        BC0_P(name, fail);
     name = "MISMATCH";    BC0_P(name, mismatch);
+#ifdef USE_SKIP_SEARCH
+    name = "SKIP";        BC0_P(name, skip);
+#endif
 
     name = "MAX";
     args[0] = ONIG_TYPE_TAG | ONIG_TYPE_LONG;

package/deps/jq/{modules → vendor}/oniguruma/src/gperf_fold_key_conv.py

@@ -1,7 +1,7 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # gperf_fold_key_conv.py
-# Copyright (c) 2016-2018  K.Kosako
+# Copyright (c) 2016-2023  K.Kosako
 
 import sys
 import re
@@ -52,7 +52,7 @@ def parse_line(s, key_len):
     return s
 
 def parse_file(f, key_len):
-    print "/* This file was converted by gperf_fold_key_conv.py\n      from gperf output file. */"
+    print("/* This file was converted by gperf_fold_key_conv.py\n      from gperf output file. */")
 
     while True:
         line = f.readline()
@@ -60,7 +60,7 @@ def parse_file(f, key_len):
             break
 
         s = parse_line(line, key_len)
-        print s
+        print(s)
 
 
 # main

package/deps/jq/{modules → vendor}/oniguruma/src/gperf_unfold_key_conv.py

@@ -1,7 +1,7 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # gperf_unfold_key_conv.py
-# Copyright (c) 2016-2018  K.Kosako
+# Copyright (c) 2016-2023  K.Kosako
 
 import sys
 import re
@@ -44,12 +44,12 @@ def parse_line(s):
     return s
 
 def parse_file(f):
-    print "/* This file was converted by gperf_unfold_key_conv.py\n      from gperf output file. */"
+    print("/* This file was converted by gperf_unfold_key_conv.py\n      from gperf output file. */")
 
     line = f.readline()
     while line:
         s = parse_line(line)
-        print s
+        print(s)
         line = f.readline()
 
 

package/deps/jq/vendor/oniguruma/src/make_unicode_egcb.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+NAME=unicode_egcb_data
+
+python3 make_unicode_egcb_data.py > ${NAME}.c
+
+exit 0

package/deps/jq/{modules → vendor}/oniguruma/src/make_unicode_egcb_data.py

@@ -1,7 +1,7 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # make_unicode_egcb_data.py
-# Copyright (c) 2017-2022  K.Kosako
+# Copyright (c) 2017-2024  K.Kosako
 
 import sys
 import re
@@ -29,10 +29,10 @@ def check_version_info(s):
 
 def print_ranges(ranges):
   for (start, end) in ranges:
-    print "0x%06x, 0x%06x" % (start, end)
+    print("0x%06x, 0x%06x" % (start, end))
 
 def print_prop_and_index(prop, i):
-  print "%-35s %3d" % (prop + ',', i)
+  print("%-35s %3d" % (prop + ',', i))
   PropIndex[prop] = i
 
 def dic_find_by_value(dic, v):
@@ -52,7 +52,7 @@ def normalize_ranges(in_ranges, sort=False):
   r = []
   prev = None
   for (start, end) in ranges:
-    if prev >= start - 1:
+    if prev is not None and prev >= start - 1:
       (pstart, pend) = r.pop()
       end = max(pend, end)
       start = pstart
@@ -192,10 +192,11 @@ merge_props(PROPS, props)
 
 PROPS = sorted(PROPS)
 
-print '/* unicode_egcb_data.c: Generated by make_unicode_egcb_data.py. */'
+print('/* unicode_egcb_data.c: Generated by make_unicode_egcb_data.py. */')
+
 COPYRIGHT = '''
 /*-
- * Copyright (c) 2017-2022  K.Kosako
+ * Copyright (c) 2017-2024  K.Kosako
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -221,13 +222,13 @@ COPYRIGHT = '''
  */
 '''.strip()
 
-print COPYRIGHT
-print ''
+print(COPYRIGHT)
+print('')
 if VERSION_INFO[0] < 0:
   raise RuntimeError("Version is not found")
 
-print "#define GRAPHEME_BREAK_PROPERTY_VERSION  %02d%02d%02d" % (VERSION_INFO[0], VERSION_INFO[1], VERSION_INFO[2])
-print ''
+print("#define GRAPHEME_BREAK_PROPERTY_VERSION  %02d%02d%02d" % (VERSION_INFO[0], VERSION_INFO[1], VERSION_INFO[2]))
+print('')
 
 ranges = []
 for prop in PROPS:
@@ -243,16 +244,16 @@ for (start, end, prop) in ranges:
     raise ValueError("{2}:{0} - {1} range overlap prev value {3}".format(start, end, prop, prev))
 
 
-print '/*'
+print('/*')
 for prop in PROPS:
-  print "%s" % prop
-print '*/'
-print ''
+  print("%s" % prop)
+print('*/')
+print('')
 
 num_ranges = len(ranges)
-print "static int EGCB_RANGE_NUM = %d;" % num_ranges
+print("static int EGCB_RANGE_NUM = %d;" % num_ranges)
 
-print 'static EGCB_RANGE_TYPE EGCB_RANGES[] = {'
+print('static EGCB_RANGE_TYPE EGCB_RANGES[] = {')
 for i, (start, end, prop) in enumerate(ranges):
   if i == num_ranges - 1:
     comma = ''
@@ -260,8 +261,8 @@ for i, (start, end, prop) in enumerate(ranges):
     comma = ','
 
   type_name = 'EGCB_' + prop
-  print " {0x%06x, 0x%06x, %s }%s" % (start, end, type_name, comma)
+  print(" {0x%06x, 0x%06x, %s }%s" % (start, end, type_name, comma))
 
-print '};'
+print('};')
 
 sys.exit(0)

package/deps/jq/{modules → vendor}/oniguruma/src/make_unicode_fold.sh

@@ -9,19 +9,19 @@ TMP3=gperf3.tmp
 
 GPERF_OPT='-n -C -T -c -t -j1 -L ANSI-C '
 
-python2 make_unicode_fold_data.py > unicode_fold_data.c
+python3 make_unicode_fold_data.py > unicode_fold_data.c
 
 ${GPERF} ${GPERF_OPT} -F,-1,0 -N onigenc_unicode_unfold_key unicode_unfold_key.gperf > ${TMP0}
-python2 gperf_unfold_key_conv.py < ${TMP0} > unicode_unfold_key.c
+python3 gperf_unfold_key_conv.py < ${TMP0} > unicode_unfold_key.c
 
 ${GPERF} ${GPERF_OPT} -F,-1 -N onigenc_unicode_fold1_key unicode_fold1_key.gperf > ${TMP1}
-python2 gperf_fold_key_conv.py 1 < ${TMP1} > unicode_fold1_key.c
+python3 gperf_fold_key_conv.py 1 < ${TMP1} > unicode_fold1_key.c
 
 ${GPERF} ${GPERF_OPT} -F,-1 -N onigenc_unicode_fold2_key unicode_fold2_key.gperf > ${TMP2}
-python2 gperf_fold_key_conv.py 2 < ${TMP2} > unicode_fold2_key.c
+python3 gperf_fold_key_conv.py 2 < ${TMP2} > unicode_fold2_key.c
 
 ${GPERF} ${GPERF_OPT} -F,-1 -N onigenc_unicode_fold3_key unicode_fold3_key.gperf > ${TMP3}
-python2 gperf_fold_key_conv.py 3 < ${TMP3} > unicode_fold3_key.c
+python3 gperf_fold_key_conv.py 3 < ${TMP3} > unicode_fold3_key.c
 
 # remove redundant EOLs before EOF
 perl -i -pe 'BEGIN{undef $/}s/\n\n*\z/\n/;' unicode_fold_data.c

package/deps/jq/{modules → vendor}/oniguruma/src/make_unicode_fold_data.py

@@ -1,7 +1,7 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 # make_unicode_fold_data.py
-# Copyright (c) 2016-2022  K.Kosako
+# Copyright (c) 2016-2024  K.Kosako
 
 import sys
 import re
@@ -30,7 +30,7 @@ LOCALE_UNFOLDS  = {}
 
 COPYRIGHT = '''
 /*-
- * Copyright (c) 2017-2022  K.Kosako
+ * Copyright (c) 2017-2024  K.Kosako
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -182,12 +182,12 @@ typedef unsigned long OnigCodePoint;
 
 def divide_by_fold_len(d):
     l = d.items()
-    l1 = filter(lambda (k,e):e.fold_len == 1, l)
-    l2 = filter(lambda (k,e):e.fold_len == 2, l)
-    l3 = filter(lambda (k,e):e.fold_len == 3, l)
-    sl1 = sorted(l1, key=lambda (k,e):k)
-    sl2 = sorted(l2, key=lambda (k,e):k)
-    sl3 = sorted(l3, key=lambda (k,e):k)
+    l1 = filter(lambda x:x[1].fold_len == 1, l)
+    l2 = filter(lambda x:x[1].fold_len == 2, l)
+    l3 = filter(lambda x:x[1].fold_len == 3, l)
+    sl1 = sorted(l1, key=lambda x:x[0])
+    sl2 = sorted(l2, key=lambda x:x[0])
+    sl3 = sorted(l3, key=lambda x:x[0])
     return (sl1, sl2, sl3)
 
 def output_comment(f, s):
@@ -198,7 +198,7 @@ def output_data_n1(f, n, fn, c, out_comment):
         e.index = c
         if out_comment and n > 1 and e.comment is not None:
             output_comment(f, e.comment)
-            print >> f, ''
+            print('', file=f)
 
         f.write(' ')
         f.write("/*%4d*/ " % c)
@@ -226,25 +226,25 @@ def output_data_n1(f, n, fn, c, out_comment):
     return c
 
 def output_data_n(f, name, n, fn, lfn, out_comment):
-    print >> f, "OnigCodePoint %s%d[] = {" % (name, n)
+    print("OnigCodePoint %s%d[] = {" % (name, n), file=f)
     c = 0
     c = output_data_n1(f, n,  fn, c, out_comment)
-    print >> f, "#define FOLDS%d_NORMAL_END_INDEX   %d" % (n, c)
-    print >> f, " /* ----- LOCALE ----- */"
+    print("#define FOLDS%d_NORMAL_END_INDEX   %d" % (n, c), file=f)
+    print(" /* ----- LOCALE ----- */", file=f)
     c = output_data_n1(f, n, lfn, c, out_comment)
-    print >> f, "#define FOLDS%d_END_INDEX   %d" % (n, c)
-    print >> f, "};"
+    print("#define FOLDS%d_END_INDEX   %d" % (n, c), file=f)
+    print("};", file=f)
 
 def output_fold_data(f, name, out_comment):
     f1, f2, f3 = divide_by_fold_len(FOLDS)
     lf1, lf2, lf3 = divide_by_fold_len(LOCALE_FOLDS)
 
     output_data_n(f, name, 1, f1, lf1, out_comment)
-    print >> f, ''
+    print('', file=f)
     output_data_n(f, name, 2, f2, lf2, out_comment)
-    print >> f, ''
+    print('', file=f)
     output_data_n(f, name, 3, f3, lf3, out_comment)
-    print >> f, ''
+    print('', file=f)
 
 def output_macros(f, name):
     print >> f, "#define FOLDS1_FOLD(i)         (%s1 + (i))" % name
@@ -264,18 +264,18 @@ def output_macros(f, name):
     print >> f, "#define FOLDS3_NEXT_INDEX(i)   ((i) + 4 + %s1[(i)+3])" % name
 
 def output_fold_source(f, out_comment):
-    print >> f, "/* This file was generated by make_unicode_fold_data.py. */"
-    print >> f, COPYRIGHT
-    print >> f, "\n"
-    print >> f, '#include "regenc.h"'
-    print >> f, ''
+    print("/* This file was generated by make_unicode_fold_data.py. */", file=f)
+    print(COPYRIGHT, file=f)
+    print("\n", file=f)
+    print('#include "regenc.h"', file=f)
+    print('', file=f)
     if VERSION_INFO[0] < 0:
       raise RuntimeError("Version is not found")
 
-    print "#define UNICODE_CASEFOLD_VERSION  %02d%02d%02d" % (VERSION_INFO[0], VERSION_INFO[1], VERSION_INFO[2])
-    print ''
+    print("#define UNICODE_CASEFOLD_VERSION  %02d%02d%02d" % (VERSION_INFO[0], VERSION_INFO[1], VERSION_INFO[2]))
+    print('')
     #output_macros(f, DataName)
-    print >> f, ''
+    print('', file=f)
     #output_typedef(f)
     output_fold_data(f, DataName, out_comment)
 
@@ -296,12 +296,12 @@ struct ByUnfoldKey {
     f.write(head)
     UNFOLDS.update(LOCALE_UNFOLDS)
     l = UNFOLDS.items()
-    sl = sorted(l, key=lambda (k,e):(e.fold_len, e.index))
+    sl = sorted(l, key=lambda x:(x[1].fold_len, x[1].index))
     for k, e in sl:
         f.write('"%s", /*0x%04x*/ %4d, %d\n' %
                 (form3bytes(k), k, e.index, e.fold_len))
 
-    print >> f, '%%'
+    print('%%', file=f)
 
 def output_gperf_fold_key(f, key_len):
     head = "%{\n/* This gperf source file was generated by make_unicode_fold_data.py */\n\n" + COPYRIGHT + """\
@@ -314,13 +314,13 @@ short int
 """
     f.write(head)
     l = FOLDS.items()
-    l = filter(lambda (k,e):e.fold_len == key_len, l)
-    sl = sorted(l, key=lambda (k,e):e.index)
+    l = filter(lambda x:x[1].fold_len == key_len, l)
+    sl = sorted(l, key=lambda x:x[1].index)
     for k, e in sl:
         skey = ''.join(map(lambda i: form3bytes(i), e.fold))
         f.write('"%s", %4d\n' % (skey, e.index))
 
-    print >> f, '%%'
+    print('%%', file=f)
 
 def output_gperf_source():
    with open(GPERF_UNFOLD_KEY_FILE, 'w') as f:
@@ -334,7 +334,7 @@ def output_gperf_source():
 
 def unfolds_byte_length_check(encode):
     l = UNFOLDS.items()
-    sl = sorted(l, key=lambda (k,e):(e.fold_len, e.index))
+    sl = sorted(l, key=lambda x:(x[1].fold_len, x[1].index))
     for unfold, e in sl:
         key_len = enc_len(unfold, encode)
         fold_len = sum(map(lambda c: enc_len(c, encode), e.fold))
@@ -345,7 +345,7 @@ def unfolds_byte_length_check(encode):
 
 def double_fold_check():
     l = UNFOLDS.items()
-    sl = sorted(l, key=lambda (k,e):(e.fold_len, e.index))
+    sl = sorted(l, key=lambda x:(x[1].fold_len, x[1].index))
     for unfold, e in sl:
         for f in e.fold:
             #print >> sys.stderr, ("check 0x%06x" % f)
@@ -356,9 +356,9 @@ def double_fold_check():
 
 def unfold_is_multi_code_folds_head_check():
     l = UNFOLDS.items()
-    l2 = filter(lambda (k,e):e.fold_len == 2, l)
-    l3 = filter(lambda (k,e):e.fold_len == 3, l)
-    sl = sorted(l, key=lambda (k,e):(e.fold_len, e.index))
+    l2 = filter(lambda x:x[1].fold_len == 2, l)
+    l3 = filter(lambda x:x[1].fold_len == 3, l)
+    sl = sorted(l, key=lambda x:(x[1].fold_len, x[1].index))
     for unfold, _ in sl:
         for k, e in l2:
             if e.fold[0] == unfold:
@@ -454,7 +454,7 @@ def get_all_folds_expansion_max_num():
     one_folds = make_one_folds(l)
     fold2_heads = make_foldn_heads(l, 2, one_folds)
     fold3_heads = make_foldn_heads(l, 3, one_folds)
-    sl = sorted(l, key=lambda (k,e):(e.fold_len, e.index))
+    sl = sorted(l, key=lambda x:(x[1].fold_len, x[1].index))
     nmax = 0
     max_unfold = None
     for unfold, e in sl: