Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (284095 => 284096)
--- trunk/Source/_javascript_Core/ChangeLog 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/ChangeLog 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,3 +1,74 @@
+2021-10-12 Alexey Proskuryakov <[email protected]>
+
+ Invoke build scripts with python3 explicitly
+ https://bugs.webkit.org/show_bug.cgi?id=231587
+
+ Reviewed by Jonathan Bedard.
+
+ Much of the work to support Python 3 was done years ago, but we need this to
+ actually use Python 3 on macOS.
+
+ Python 3 no longer raises ValueError on relative module import failure, so changed
+ that to the correct ImportError.
+
+ * DerivedSources.make:
+ * Scripts/UpdateContents.py:
+ * Scripts/cssmin.py:
+ * Scripts/generate-combined-inspector-json.py:
+ * Scripts/generate-js-builtins.py:
+ * Scripts/inline-and-minify-stylesheets-and-scripts.py:
+ * Scripts/lazywriter.py:
+ * Scripts/make-js-file-arrays.py:
+ * Scripts/wkbuiltins/builtins_generate_combined_header.py:
+ * Scripts/wkbuiltins/builtins_generate_combined_implementation.py:
+ * Scripts/wkbuiltins/builtins_generate_internals_wrapper_header.py:
+ * Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py:
+ * Scripts/wkbuiltins/builtins_generate_separate_header.py:
+ * Scripts/wkbuiltins/builtins_generate_separate_implementation.py:
+ * Scripts/wkbuiltins/builtins_generate_wrapper_header.py:
+ * Scripts/wkbuiltins/builtins_generate_wrapper_implementation.py:
+ * Scripts/wkbuiltins/builtins_generator.py:
+ * Scripts/wkbuiltins/builtins_model.py:
+ * Scripts/wkbuiltins/builtins_templates.py:
+ * disassembler/udis86/ud_opcode.py:
+ (UdOpcodeTable.entries):
+ (UdOpcodeTables.addSSE2AVXInsn):
+ (itemslist): Deleted.
+ * inspector/scripts/codegen/cpp_generator.py:
+ * inspector/scripts/codegen/cpp_generator_templates.py:
+ * inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py:
+ * inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py:
+ * inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:
+ * inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py:
+ * inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py:
+ * inspector/scripts/codegen/generate_cpp_protocol_types_header.py:
+ * inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py:
+ * inspector/scripts/codegen/generate_js_backend_commands.py:
+ * inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py:
+ * inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py:
+ * inspector/scripts/codegen/generate_objc_configuration_header.py:
+ * inspector/scripts/codegen/generate_objc_configuration_implementation.py:
+ * inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py:
+ * inspector/scripts/codegen/generate_objc_header.py:
+ * inspector/scripts/codegen/generate_objc_internal_header.py:
+ * inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py:
+ * inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py:
+ * inspector/scripts/codegen/generate_objc_protocol_types_implementation.py:
+ * inspector/scripts/codegen/generator.py:
+ * inspector/scripts/codegen/generator_templates.py:
+ * inspector/scripts/codegen/models.py:
+ * inspector/scripts/codegen/objc_generator.py:
+ * inspector/scripts/codegen/objc_generator_templates.py:
+ * inspector/scripts/generate-inspector-protocol-bindings.py:
+ * wasm/generateWasm.py:
+ * wasm/generateWasmB3IRGeneratorInlinesHeader.py:
+ * wasm/generateWasmOpsHeader.py:
+ * yarr/create_regex_tables:
+ (in): Deleted.
+ * yarr/generateYarrCanonicalizeUnicode:
+ * yarr/generateYarrUnicodePropertyTables.py:
+ * yarr/hasher.py:
+
2021-10-13 Alex Christensen <[email protected]>
Remove WTF::Variant and WTF::get
Modified: trunk/Source/_javascript_Core/DerivedSources.make (284095 => 284096)
--- trunk/Source/_javascript_Core/DerivedSources.make 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/DerivedSources.make 2021-10-13 16:47:03 UTC (rev 284096)
@@ -24,7 +24,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PYTHON = python
+PYTHON = python3
PERL = perl
RUBY = ruby
DELETE = rm -f
Modified: trunk/Source/_javascript_Core/Scripts/UpdateContents.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/UpdateContents.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/UpdateContents.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2015 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/Scripts/cssmin.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/cssmin.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/cssmin.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2013 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/Scripts/generate-combined-inspector-json.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/generate-combined-inspector-json.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/generate-combined-inspector-json.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2013 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/Scripts/generate-js-builtins.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/generate-js-builtins.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/generate-js-builtins.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
Modified: trunk/Source/_javascript_Core/Scripts/inline-and-minify-stylesheets-and-scripts.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/inline-and-minify-stylesheets-and-scripts.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/inline-and-minify-stylesheets-and-scripts.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2013 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/Scripts/lazywriter.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/lazywriter.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/lazywriter.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2015 Apple Inc. All rights reserved.
# Copyright (c) 2009 Google Inc. All rights reserved.
Modified: trunk/Source/_javascript_Core/Scripts/make-js-file-arrays.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/make-js-file-arrays.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/make-js-file-arrays.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2014 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_combined_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_combined_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_combined_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014-2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
Modified: trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_combined_implementation.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_combined_implementation.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_combined_implementation.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
Modified: trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_internals_wrapper_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_internals_wrapper_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_internals_wrapper_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2016-2021 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_internals_wrapper_implementation.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2016-2021 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_separate_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_separate_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_separate_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
Modified: trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_separate_implementation.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_separate_implementation.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_separate_implementation.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
Modified: trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_wrapper_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_wrapper_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_wrapper_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2016-2019 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_wrapper_implementation.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_wrapper_implementation.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generate_wrapper_implementation.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2016 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generator.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generator.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_generator.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
Modified: trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_model.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_model.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_model.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2015-2016 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_templates.py (284095 => 284096)
--- trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_templates.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/Scripts/wkbuiltins/builtins_templates.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014-2021 Apple Inc. All rights reserved.
# Copyright (C) 2015 Canon Inc. All rights reserved.
Modified: trunk/Source/_javascript_Core/disassembler/udis86/ud_opcode.py (284095 => 284096)
--- trunk/Source/_javascript_Core/disassembler/udis86/ud_opcode.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/disassembler/udis86/ud_opcode.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -25,13 +25,6 @@
import os
-# Some compatibility stuff for supporting python 2.x as well as python 3.x
-def itemslist(dict):
- try:
- return dict.iteritems() # python 2.x
- except AttributeError:
- return list(dict.items()) # python 3.x
-
class UdInsnDef:
"""An x86 instruction definition
"""
@@ -177,7 +170,7 @@
return self._TableInfo[self._typ]['size']
def entries(self):
- return itemslist(self._entries)
+ return list(self._entries.items())
def numEntries(self):
return len(self._entries.keys())
@@ -483,7 +476,7 @@
ssemnemonic = insnDef['mnemonic']
sseopcodes = insnDef['opcodes']
# remove vex opcode extensions
- sseopcexts = dict([(e, v) for e, v in itemslist(insnDef['opcexts'])
+ sseopcexts = dict([(e, v) for e, v in list(insnDef['opcexts'].items())
if not e.startswith('/vex')])
# strip out avx operands, preserving relative ordering
# of remaining operands
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014-2018 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -31,7 +31,7 @@
try:
from .generator import ucfirst, Generator
from .models import PrimitiveType, ObjectType, ArrayType, EnumType, AliasedType, Frameworks
-except ValueError:
+except ImportError:
from generator import ucfirst, Generator
from models import PrimitiveType, ObjectType, ArrayType, EnumType, AliasedType, Frameworks
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator_templates.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator_templates.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/cpp_generator_templates.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014-2018 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -34,7 +34,7 @@
from .cpp_generator import CppGenerator
from .cpp_generator_templates import CppGeneratorTemplates as CppTemplates
from .models import EnumType, AliasedType
-except ValueError:
+except ImportError:
from cpp_generator import CppGenerator
from cpp_generator_templates import CppGeneratorTemplates as CppTemplates
from models import EnumType, AliasedType
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014-2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -35,7 +35,7 @@
from .cpp_generator_templates import CppGeneratorTemplates as CppTemplates
from .generator import Generator, ucfirst
from .models import EnumType
-except ValueError:
+except ImportError:
from cpp_generator import CppGenerator
from cpp_generator_templates import CppGeneratorTemplates as CppTemplates
from generator import Generator, ucfirst
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014-2018 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -34,7 +34,7 @@
from .cpp_generator_templates import CppGeneratorTemplates as CppTemplates
from .generator import Generator, ucfirst
from .models import ObjectType, ArrayType, AliasedType, EnumType
-except ValueError:
+except ImportError:
from cpp_generator import CppGenerator
from cpp_generator_templates import CppGeneratorTemplates as CppTemplates
from generator import Generator, ucfirst
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014-2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -35,7 +35,7 @@
from .cpp_generator_templates import CppGeneratorTemplates as CppTemplates
from .generator import Generator, ucfirst
from .models import EnumType
-except ValueError:
+except ImportError:
from cpp_generator import CppGenerator
from cpp_generator_templates import CppGeneratorTemplates as CppTemplates
from generator import Generator, ucfirst
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014-2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014-2018 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -36,7 +36,7 @@
from .cpp_generator_templates import CppGeneratorTemplates as CppTemplates
from .generator import Generator, ucfirst
from .models import EnumType, ObjectType, PrimitiveType, AliasedType, ArrayType, Frameworks
-except ValueError:
+except ImportError:
from cpp_generator import CppGenerator
from cpp_generator_templates import CppGeneratorTemplates as CppTemplates
from generator import Generator, ucfirst
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014-2018 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -35,7 +35,7 @@
from .cpp_generator_templates import CppGeneratorTemplates as CppTemplates
from .generator import Generator, ucfirst
from .models import AliasedType, ArrayType, EnumType, ObjectType
-except ValueError:
+except ImportError:
from cpp_generator import CppGenerator
from cpp_generator_templates import CppGeneratorTemplates as CppTemplates
from generator import Generator, ucfirst
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_js_backend_commands.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_js_backend_commands.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_js_backend_commands.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -34,7 +34,7 @@
from .generator import Generator, ucfirst
from .generator_templates import GeneratorTemplates as Templates
from .models import EnumType
-except ValueError:
+except ImportError:
from generator import Generator, ucfirst
from generator_templates import GeneratorTemplates as Templates
from models import EnumType
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -36,7 +36,7 @@
from .models import EnumType, AliasedType, Frameworks
from .objc_generator import ObjCGenerator
from .objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
-except ValueError:
+except ImportError:
from cpp_generator import CppGenerator
from generator import Generator
from models import EnumType, AliasedType, Frameworks
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_backend_dispatcher_implementation.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014-2018 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -36,7 +36,7 @@
from .models import PrimitiveType, EnumType, AliasedType, Frameworks
from .objc_generator import ObjCTypeCategory, ObjCGenerator, join_type_and_name
from .objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
-except ValueError:
+except ImportError:
from cpp_generator import CppGenerator
from generator import Generator
from models import PrimitiveType, EnumType, AliasedType, Frameworks
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_configuration_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_configuration_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_configuration_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -33,7 +33,7 @@
from .generator import Generator
from .objc_generator import ObjCGenerator
from .objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
-except ValueError:
+except ImportError:
from generator import Generator
from objc_generator import ObjCGenerator
from objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_configuration_implementation.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_configuration_implementation.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_configuration_implementation.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -33,7 +33,7 @@
from .generator import Generator
from .objc_generator import ObjCGenerator
from .objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
-except ValueError:
+except ImportError:
from generator import Generator
from objc_generator import ObjCGenerator
from objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_frontend_dispatcher_implementation.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014-2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -34,7 +34,7 @@
from .generator import Generator, ucfirst
from .objc_generator import ObjCGenerator
from .objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
-except ValueError:
+except ImportError:
from cpp_generator import CppGenerator
from generator import Generator, ucfirst
from objc_generator import ObjCGenerator
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -34,7 +34,7 @@
from .models import ObjectType, EnumType
from .objc_generator import ObjCGenerator, join_type_and_name
from .objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
-except ValueError:
+except ImportError:
from generator import Generator, ucfirst
from models import ObjectType, EnumType
from objc_generator import ObjCGenerator, join_type_and_name
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_internal_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_internal_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_internal_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -33,7 +33,7 @@
from .generator import Generator, ucfirst
from .objc_generator import ObjCGenerator
from .objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
-except ValueError:
+except ImportError:
from generator import Generator, ucfirst
from objc_generator import ObjCGenerator
from objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_header.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -34,7 +34,7 @@
from .models import EnumType, Frameworks
from .objc_generator import ObjCGenerator
from .objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
-except ValueError:
+except ImportError:
from generator import Generator
from models import EnumType, Frameworks
from objc_generator import ObjCGenerator
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_type_conversions_implementation.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2016 Apple Inc. All rights reserved.
#
@@ -33,7 +33,7 @@
from .models import EnumType, ObjectType, ArrayType, AliasedType, PrimitiveType, Frameworks
from .objc_generator import ObjCGenerator
from .objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
-except ValueError:
+except ImportError:
from generator import Generator
from models import EnumType, ObjectType, ArrayType, AliasedType, PrimitiveType, Frameworks
from objc_generator import ObjCGenerator
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_protocol_types_implementation.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -34,7 +34,7 @@
from .models import ObjectType, EnumType, Frameworks
from .objc_generator import ObjCTypeCategory, ObjCGenerator
from .objc_generator_templates import ObjCGeneratorTemplates as ObjCTemplates
-except ValueError:
+except ImportError:
from generator import Generator, ucfirst
from models import ObjectType, EnumType, Frameworks
from objc_generator import ObjCTypeCategory, ObjCGenerator
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generator.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generator.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generator.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
@@ -32,7 +32,7 @@
try:
from .generator_templates import GeneratorTemplates as Templates
from .models import PrimitiveType, ObjectType, ArrayType, EnumType, AliasedType, Frameworks
-except ValueError:
+except ImportError:
from generator_templates import GeneratorTemplates as Templates
from models import PrimitiveType, ObjectType, ArrayType, EnumType, AliasedType, Frameworks
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generator_templates.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generator_templates.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generator_templates.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/models.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/models.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/models.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
#
@@ -27,7 +27,7 @@
try:
from .generator import Generator, ucfirst
from .models import PrimitiveType, ObjectType, ArrayType, EnumType, AliasedType, Frameworks
-except ValueError:
+except ImportError:
from generator import Generator, ucfirst
from models import PrimitiveType, ObjectType, ArrayType, EnumType, AliasedType, Frameworks
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator_templates.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator_templates.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/objc_generator_templates.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
Modified: trunk/Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py (284095 => 284096)
--- trunk/Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/inspector/scripts/generate-inspector-protocol-bindings.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
# Copyright (c) 2014 University of Washington. All rights reserved.
Modified: trunk/Source/_javascript_Core/wasm/generateWasm.py (284095 => 284096)
--- trunk/Source/_javascript_Core/wasm/generateWasm.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/wasm/generateWasm.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2016-2017 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/wasm/generateWasmB3IRGeneratorInlinesHeader.py (284095 => 284096)
--- trunk/Source/_javascript_Core/wasm/generateWasmB3IRGeneratorInlinesHeader.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/wasm/generateWasmB3IRGeneratorInlinesHeader.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2016 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/wasm/generateWasmOpsHeader.py (284095 => 284096)
--- trunk/Source/_javascript_Core/wasm/generateWasmOpsHeader.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/wasm/generateWasmOpsHeader.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2016-2017 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/yarr/create_regex_tables (284095 => 284096)
--- trunk/Source/_javascript_Core/yarr/create_regex_tables 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/yarr/create_regex_tables 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2010, 2013-2017 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/yarr/generateYarrCanonicalizeUnicode (284095 => 284096)
--- trunk/Source/_javascript_Core/yarr/generateYarrCanonicalizeUnicode 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/yarr/generateYarrCanonicalizeUnicode 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2016-2019 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/yarr/generateYarrUnicodePropertyTables.py (284095 => 284096)
--- trunk/Source/_javascript_Core/yarr/generateYarrUnicodePropertyTables.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/yarr/generateYarrUnicodePropertyTables.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2017 Apple Inc. All rights reserved.
#
Modified: trunk/Source/_javascript_Core/yarr/hasher.py (284095 => 284096)
--- trunk/Source/_javascript_Core/yarr/hasher.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/_javascript_Core/yarr/hasher.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2005, 2006, 2007, 2008 Nikolas Zimmermann <[email protected]>
# Copyright (C) 2006 Anders Carlsson <[email protected]>
Modified: trunk/Source/WebCore/ChangeLog (284095 => 284096)
--- trunk/Source/WebCore/ChangeLog 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebCore/ChangeLog 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,3 +1,23 @@
+2021-10-12 Alexey Proskuryakov <[email protected]>
+
+ Invoke build scripts with python3 explicitly
+ https://bugs.webkit.org/show_bug.cgi?id=231587
+
+ Reviewed by Jonathan Bedard.
+
+ Much of the work to support Python 3 was done years ago, but we need this to
+ actually use Python 3 on macOS.
+
+ * DerivedSources.make:
+ * css/makeSelectorPseudoClassAndCompatibilityElementMap.py:
+ * css/makeSelectorPseudoElementsMap.py:
+ * html/parser/create-html-entity-table:
+ (convert_entity_to_cpp_name): Deleted.
+ (convert_value_to_int): Deleted.
+ (offset_table_entry): Deleted.
+ * platform/network/create-http-header-name-table:
+ (HTTPHeaderName): Deleted.
+
2021-10-13 Alex Christensen <[email protected]>
Remove WTF::Variant and WTF::get
Modified: trunk/Source/WebCore/DerivedSources.make (284095 => 284096)
--- trunk/Source/WebCore/DerivedSources.make 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebCore/DerivedSources.make 2021-10-13 16:47:03 UTC (rev 284096)
@@ -26,7 +26,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PYTHON = python
+PYTHON = python3
PERL = perl
RUBY = ruby
DELETE = rm -f
Modified: trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py (284095 => 284096)
--- trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebCore/css/makeSelectorPseudoClassAndCompatibilityElementMap.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2014 Apple Inc. All rights reserved.
#
Modified: trunk/Source/WebCore/css/makeSelectorPseudoElementsMap.py (284095 => 284096)
--- trunk/Source/WebCore/css/makeSelectorPseudoElementsMap.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebCore/css/makeSelectorPseudoElementsMap.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2014 Apple Inc. All rights reserved.
#
Modified: trunk/Source/WebCore/html/parser/create-html-entity-table (284095 => 284096)
--- trunk/Source/WebCore/html/parser/create-html-entity-table 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebCore/html/parser/create-html-entity-table 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (c) 2010 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: trunk/Source/WebCore/platform/network/create-http-header-name-table (284095 => 284096)
--- trunk/Source/WebCore/platform/network/create-http-header-name-table 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebCore/platform/network/create-http-header-name-table 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (c) 2014 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: trunk/Source/WebInspectorUI/ChangeLog (284095 => 284096)
--- trunk/Source/WebInspectorUI/ChangeLog 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebInspectorUI/ChangeLog 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,3 +1,15 @@
+2021-10-12 Alexey Proskuryakov <[email protected]>
+
+ Invoke build scripts with python3 explicitly
+ https://bugs.webkit.org/show_bug.cgi?id=231587
+
+ Reviewed by Jonathan Bedard.
+
+ Much of the work to support Python 3 was done years ago, but we need this to
+ actually use Python 3 on macOS.
+
+ * Scripts/copy-user-interface-resources.pl:
+
2021-10-11 BJ Burg <[email protected]>
Web Inspector: add TabBar context menu support for WI.WebInspectorExtensionTabContentView
Modified: trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl (284095 => 284096)
--- trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl 2021-10-13 16:47:03 UTC (rev 284096)
@@ -156,7 +156,7 @@
EOF
my $perl = $^X;
-my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python" : "python";
+my $python = ($OSNAME =~ /cygwin/) ? "/usr/bin/python3" : "python3";
my $derivedSourcesDir = $ENV{'DERIVED_SOURCES_DIR'};
my $scriptsRoot = File::Spec->catdir($ENV{'SRCROOT'}, 'Scripts');
my $sharedScriptsRoot = File::Spec->catdir($ENV{'_javascript_CORE_PRIVATE_HEADERS_DIR'});
Modified: trunk/Source/WebKit/ChangeLog (284095 => 284096)
--- trunk/Source/WebKit/ChangeLog 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebKit/ChangeLog 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,3 +1,21 @@
+2021-10-12 Alexey Proskuryakov <[email protected]>
+
+ Invoke build scripts with python3 explicitly
+ https://bugs.webkit.org/show_bug.cgi?id=231587
+
+ Reviewed by Jonathan Bedard.
+
+ Much of the work to support Python 3 was done years ago, but we need this to
+ actually use Python 3 on macOS.
+
+ * DerivedSources.make:
+ * Scripts/generate-message-receiver.py:
+ * Scripts/postprocess-header-rule:
+ * Scripts/webkit/messages_unittest.py:
+ * Scripts/webkit/model_unittest.py:
+ * Scripts/webkit/parser_unittest.py:
+ * Scripts/webkit/tests/Makefile:
+
2021-10-13 Alex Christensen <[email protected]>
Remove WTF::Variant and WTF::get
Modified: trunk/Source/WebKit/DerivedSources.make (284095 => 284096)
--- trunk/Source/WebKit/DerivedSources.make 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebKit/DerivedSources.make 2021-10-13 16:47:03 UTC (rev 284096)
@@ -108,7 +108,7 @@
$(WEBKITADDITIONS_HEADER_SEARCH_PATHS) \
#
-PYTHON = python
+PYTHON = python3
PERL = perl
RUBY = ruby
@@ -305,7 +305,7 @@
all : $(GENERATED_MESSAGES_FILES)
$(GENERATED_MESSAGES_FILES_AS_PATTERNS) : $(MESSAGES_IN_FILES) $(GENERATE_MESSAGE_RECEIVER_SCRIPTS)
- python $(GENERATE_MESSAGE_RECEIVER_SCRIPT) $(WebKit2) $(MESSAGE_RECEIVERS)
+ $(PYTHON) $(GENERATE_MESSAGE_RECEIVER_SCRIPT) $(WebKit2) $(MESSAGE_RECEIVERS)
TEXT_PREPROCESSOR_FLAGS=-E -P -w
Modified: trunk/Source/WebKit/Scripts/generate-message-receiver.py (284095 => 284096)
--- trunk/Source/WebKit/Scripts/generate-message-receiver.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebKit/Scripts/generate-message-receiver.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Copyright (C) 2010 Apple Inc. All rights reserved.
#
Modified: trunk/Source/WebKit/Scripts/postprocess-header-rule (284095 => 284096)
--- trunk/Source/WebKit/Scripts/postprocess-header-rule 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebKit/Scripts/postprocess-header-rule 2021-10-13 16:47:03 UTC (rev 284096)
@@ -46,7 +46,7 @@
ditto "${SOURCE_FILE}" "${WORK_FILE}"
if [[ ! -z `grep '#import <WebKitAdditions/.*\.h>' "${WORK_FILE}"` ]]; then
- python "${SRCROOT}/mac/replace-webkit-additions-includes.py" "${WORK_FILE}" "${BUILT_PRODUCTS_DIR}" "${SDKROOT}" || exit $?
+ python3 "${SRCROOT}/mac/replace-webkit-additions-includes.py" "${WORK_FILE}" "${BUILT_PRODUCTS_DIR}" "${SDKROOT}" || exit $?
fi
if [[ "${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}" != "YES" ]]; then
Modified: trunk/Source/WebKit/Scripts/webkit/messages_unittest.py (284095 => 284096)
--- trunk/Source/WebKit/Scripts/webkit/messages_unittest.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebKit/Scripts/webkit/messages_unittest.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -21,9 +21,9 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Examples of how to run:
-# python Source/WebKit/Scripts/webkit/messages_unittest.py [-r]
-# cd Source/WebKit/Scripts && python -m webkit.messages_unittest
-# cd Source/WebKit/Scripts && python -m unittest discover -p '*_unittest.py'
+# python3 Source/WebKit/Scripts/webkit/messages_unittest.py [-r]
+# cd Source/WebKit/Scripts && python3 -m webkit.messages_unittest
+# cd Source/WebKit/Scripts && python3 -m unittest discover -p '*_unittest.py'
import os
import re
Modified: trunk/Source/WebKit/Scripts/webkit/model_unittest.py (284095 => 284096)
--- trunk/Source/WebKit/Scripts/webkit/model_unittest.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebKit/Scripts/webkit/model_unittest.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -21,9 +21,9 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Examples of how to run:
-# python Source/WebKit/Scripts/webkit/model_unittest.py
-# cd Source/WebKit/Scripts && python -m webkit.model_unittest
-# cd Source/WebKit/Scripts && python -m unittest discover -p '*_unittest.py'
+# python3 Source/WebKit/Scripts/webkit/model_unittest.py
+# cd Source/WebKit/Scripts && python3 -m webkit.model_unittest
+# cd Source/WebKit/Scripts && python3 -m unittest discover -p '*_unittest.py'
import os
import sys
Modified: trunk/Source/WebKit/Scripts/webkit/parser_unittest.py (284095 => 284096)
--- trunk/Source/WebKit/Scripts/webkit/parser_unittest.py 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebKit/Scripts/webkit/parser_unittest.py 2021-10-13 16:47:03 UTC (rev 284096)
@@ -21,9 +21,9 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Examples of how to run:
-# python Source/WebKit/Scripts/webkit/parser_unittest.py
-# cd Source/WebKit/Scripts && python -m webkit.parser_unittest
-# cd Source/WebKit/Scripts && python -m unittest discover -p '*_unittest.py'
+# python3 Source/WebKit/Scripts/webkit/parser_unittest.py
+# cd Source/WebKit/Scripts && python3 -m webkit.parser_unittest
+# cd Source/WebKit/Scripts && python3 -m unittest discover -p '*_unittest.py'
import os
import re
Modified: trunk/Source/WebKit/Scripts/webkit/tests/Makefile (284095 => 284096)
--- trunk/Source/WebKit/Scripts/webkit/tests/Makefile 2021-10-13 16:17:09 UTC (rev 284095)
+++ trunk/Source/WebKit/Scripts/webkit/tests/Makefile 2021-10-13 16:47:03 UTC (rev 284096)
@@ -12,4 +12,4 @@
#
all:
- python ../../generate-message-receiver.py . $(TESTS)
+ python3 ../../generate-message-receiver.py . $(TESTS)
