Merge pull request #8918 from mensinda/pathlibFixes

pathlib: Patch pathlib to work around some bugs (fixes #8263 #7295)

11 files changed, 100 insertions, 88 deletions

diff --git a/mesonbuild/templates/cpptemplates.py b/mesonbuild/templates/cpptemplates.py
index 2d28d3a..61c2737 100644
--- a/mesonbuild/templates/cpptemplates.py
+++ b/mesonbuild/templates/cpptemplates.py
@@ -149,11 +149,12 @@ class CppProject(SampleImpl):
     def create_executable(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
         source_name = lowercase_token + '.cpp'
-        open(source_name, 'w').write(hello_cpp_template.format(project_name=self.name))
-        open('meson.build', 'w').write(hello_cpp_meson_template.format(project_name=self.name,
-                                                                       exe_name=lowercase_token,
-                                                                       source_name=source_name,
-                                                                       version=self.version))
+        open(source_name, 'w', encoding='utf-8').write(hello_cpp_template.format(project_name=self.name))
+        open('meson.build', 'w', encoding='utf-8').write(
+            hello_cpp_meson_template.format(project_name=self.name,
+                                            exe_name=lowercase_token,
+                                            source_name=source_name,
+                                            version=self.version))
 
     def create_library(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
@@ -178,7 +179,7 @@ class CppProject(SampleImpl):
                   'test_name': lowercase_token,
                   'version': self.version,
                   }
-        open(lib_hpp_name, 'w').write(lib_hpp_template.format(**kwargs))
-        open(lib_cpp_name, 'w').write(lib_cpp_template.format(**kwargs))
-        open(test_cpp_name, 'w').write(lib_cpp_test_template.format(**kwargs))
-        open('meson.build', 'w').write(lib_cpp_meson_template.format(**kwargs))
+        open(lib_hpp_name, 'w', encoding='utf-8').write(lib_hpp_template.format(**kwargs))
+        open(lib_cpp_name, 'w', encoding='utf-8').write(lib_cpp_template.format(**kwargs))
+        open(test_cpp_name, 'w', encoding='utf-8').write(lib_cpp_test_template.format(**kwargs))
+        open('meson.build', 'w', encoding='utf-8').write(lib_cpp_meson_template.format(**kwargs))
diff --git a/mesonbuild/templates/cstemplates.py b/mesonbuild/templates/cstemplates.py
index 8524c97..bad7984 100644
--- a/mesonbuild/templates/cstemplates.py
+++ b/mesonbuild/templates/cstemplates.py
@@ -100,12 +100,14 @@ class CSharpProject(SampleImpl):
         uppercase_token = lowercase_token.upper()
         class_name = uppercase_token[0] + lowercase_token[1:]
         source_name = uppercase_token[0] + lowercase_token[1:] + '.cs'
-        open(source_name, 'w').write(hello_cs_template.format(project_name=self.name,
-                                                              class_name=class_name))
-        open('meson.build', 'w').write(hello_cs_meson_template.format(project_name=self.name,
-                                                                      exe_name=self.name,
-                                                                      source_name=source_name,
-                                                                      version=self.version))
+        open(source_name, 'w', encoding='utf-8').write(
+            hello_cs_template.format(project_name=self.name,
+                                     class_name=class_name))
+        open('meson.build', 'w', encoding='utf-8').write(
+          hello_cs_meson_template.format(project_name=self.name,
+                                         exe_name=self.name,
+                                         source_name=source_name,
+                                         version=self.version))
 
     def create_library(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
@@ -127,6 +129,6 @@ class CSharpProject(SampleImpl):
                   'test_name': lowercase_token,
                   'version': self.version,
                   }
-        open(lib_cs_name, 'w').write(lib_cs_template.format(**kwargs))
-        open(test_cs_name, 'w').write(lib_cs_test_template.format(**kwargs))
-        open('meson.build', 'w').write(lib_cs_meson_template.format(**kwargs))
+        open(lib_cs_name, 'w', encoding='utf-8').write(lib_cs_template.format(**kwargs))
+        open(test_cs_name, 'w', encoding='utf-8').write(lib_cs_test_template.format(**kwargs))
+        open('meson.build', 'w', encoding='utf-8').write(lib_cs_meson_template.format(**kwargs))
diff --git a/mesonbuild/templates/ctemplates.py b/mesonbuild/templates/ctemplates.py
index 440731c..9b651bc 100644
--- a/mesonbuild/templates/ctemplates.py
+++ b/mesonbuild/templates/ctemplates.py
@@ -132,11 +132,12 @@ class CProject(SampleImpl):
     def create_executable(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
         source_name = lowercase_token + '.c'
-        open(source_name, 'w').write(hello_c_template.format(project_name=self.name))
-        open('meson.build', 'w').write(hello_c_meson_template.format(project_name=self.name,
-                                                                     exe_name=lowercase_token,
-                                                                     source_name=source_name,
-                                                                     version=self.version))
+        open(source_name, 'w', encoding='utf-8').write(hello_c_template.format(project_name=self.name))
+        open('meson.build', 'w', encoding='utf-8').write(
+            hello_c_meson_template.format(project_name=self.name,
+                                          exe_name=lowercase_token,
+                                          source_name=source_name,
+                                          version=self.version))
 
     def create_library(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
@@ -159,7 +160,7 @@ class CProject(SampleImpl):
                   'test_name': lowercase_token,
                   'version': self.version,
                   }
-        open(lib_h_name, 'w').write(lib_h_template.format(**kwargs))
-        open(lib_c_name, 'w').write(lib_c_template.format(**kwargs))
-        open(test_c_name, 'w').write(lib_c_test_template.format(**kwargs))
-        open('meson.build', 'w').write(lib_c_meson_template.format(**kwargs))
+        open(lib_h_name, 'w', encoding='utf-8').write(lib_h_template.format(**kwargs))
+        open(lib_c_name, 'w', encoding='utf-8').write(lib_c_template.format(**kwargs))
+        open(test_c_name, 'w', encoding='utf-8').write(lib_c_test_template.format(**kwargs))
+        open('meson.build', 'w', encoding='utf-8').write(lib_c_meson_template.format(**kwargs))
diff --git a/mesonbuild/templates/cudatemplates.py b/mesonbuild/templates/cudatemplates.py
index 4fa9a2b..919db21 100644
--- a/mesonbuild/templates/cudatemplates.py
+++ b/mesonbuild/templates/cudatemplates.py
@@ -149,11 +149,12 @@ class CudaProject(SampleImpl):
     def create_executable(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
         source_name = lowercase_token + '.cu'
-        open(source_name, 'w').write(hello_cuda_template.format(project_name=self.name))
-        open('meson.build', 'w').write(hello_cuda_meson_template.format(project_name=self.name,
-                                                                        exe_name=lowercase_token,
-                                                                        source_name=source_name,
-                                                                        version=self.version))
+        open(source_name, 'w', encoding='utf-8').write(hello_cuda_template.format(project_name=self.name))
+        open('meson.build', 'w', encoding='utf-8').write(
+            hello_cuda_meson_template.format(project_name=self.name,
+                                             exe_name=lowercase_token,
+                                             source_name=source_name,
+                                             version=self.version))
 
     def create_library(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
@@ -178,7 +179,7 @@ class CudaProject(SampleImpl):
                   'test_name': lowercase_token,
                   'version': self.version,
                   }
-        open(lib_h_name, 'w').write(lib_h_template.format(**kwargs))
-        open(lib_cuda_name, 'w').write(lib_cuda_template.format(**kwargs))
-        open(test_cuda_name, 'w').write(lib_cuda_test_template.format(**kwargs))
-        open('meson.build', 'w').write(lib_cuda_meson_template.format(**kwargs))
+        open(lib_h_name, 'w', encoding='utf-8').write(lib_h_template.format(**kwargs))
+        open(lib_cuda_name, 'w', encoding='utf-8').write(lib_cuda_template.format(**kwargs))
+        open(test_cuda_name, 'w', encoding='utf-8').write(lib_cuda_test_template.format(**kwargs))
+        open('meson.build', 'w', encoding='utf-8').write(lib_cuda_meson_template.format(**kwargs))
diff --git a/mesonbuild/templates/dlangtemplates.py b/mesonbuild/templates/dlangtemplates.py
index 4aacda8..3d939d8 100644
--- a/mesonbuild/templates/dlangtemplates.py
+++ b/mesonbuild/templates/dlangtemplates.py
@@ -110,11 +110,12 @@ class DlangProject(SampleImpl):
     def create_executable(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
         source_name = lowercase_token + '.d'
-        open(source_name, 'w').write(hello_d_template.format(project_name=self.name))
-        open('meson.build', 'w').write(hello_d_meson_template.format(project_name=self.name,
-                                                                     exe_name=lowercase_token,
-                                                                     source_name=source_name,
-                                                                     version=self.version))
+        open(source_name, 'w', encoding='utf-8').write(hello_d_template.format(project_name=self.name))
+        open('meson.build', 'w', encoding='utf-8').write(
+            hello_d_meson_template.format(project_name=self.name,
+                                          exe_name=lowercase_token,
+                                          source_name=source_name,
+                                          version=self.version))
 
     def create_library(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
@@ -137,6 +138,6 @@ class DlangProject(SampleImpl):
                   'test_name': lowercase_token,
                   'version': self.version,
                   }
-        open(lib_d_name, 'w').write(lib_d_template.format(**kwargs))
-        open(test_d_name, 'w').write(lib_d_test_template.format(**kwargs))
-        open('meson.build', 'w').write(lib_d_meson_template.format(**kwargs))
+        open(lib_d_name, 'w', encoding='utf-8').write(lib_d_template.format(**kwargs))
+        open(test_d_name, 'w', encoding='utf-8').write(lib_d_test_template.format(**kwargs))
+        open('meson.build', 'w', encoding='utf-8').write(lib_d_meson_template.format(**kwargs))
diff --git a/mesonbuild/templates/fortrantemplates.py b/mesonbuild/templates/fortrantemplates.py
index f4cae66..8fc1bca 100644
--- a/mesonbuild/templates/fortrantemplates.py
+++ b/mesonbuild/templates/fortrantemplates.py
@@ -109,11 +109,12 @@ class FortranProject(SampleImpl):
     def create_executable(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
         source_name = lowercase_token + '.f90'
-        open(source_name, 'w').write(hello_fortran_template.format(project_name=self.name))
-        open('meson.build', 'w').write(hello_fortran_meson_template.format(project_name=self.name,
-                                                                           exe_name=lowercase_token,
-                                                                           source_name=source_name,
-                                                                           version=self.version))
+        open(source_name, 'w', encoding='utf-8').write(hello_fortran_template.format(project_name=self.name))
+        open('meson.build', 'w', encoding='utf-8').write(
+            hello_fortran_meson_template.format(project_name=self.name,
+                                                exe_name=lowercase_token,
+                                                source_name=source_name,
+                                                version=self.version))
 
     def create_library(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
@@ -134,6 +135,6 @@ class FortranProject(SampleImpl):
                   'test_name': lowercase_token,
                   'version': self.version,
                   }
-        open(lib_fortran_name, 'w').write(lib_fortran_template.format(**kwargs))
-        open(test_fortran_name, 'w').write(lib_fortran_test_template.format(**kwargs))
-        open('meson.build', 'w').write(lib_fortran_meson_template.format(**kwargs))
+        open(lib_fortran_name, 'w', encoding='utf-8').write(lib_fortran_template.format(**kwargs))
+        open(test_fortran_name, 'w', encoding='utf-8').write(lib_fortran_test_template.format(**kwargs))
+        open('meson.build', 'w', encoding='utf-8').write(lib_fortran_meson_template.format(**kwargs))
diff --git a/mesonbuild/templates/javatemplates.py b/mesonbuild/templates/javatemplates.py
index 9c64743..e432961 100644
--- a/mesonbuild/templates/javatemplates.py
+++ b/mesonbuild/templates/javatemplates.py
@@ -104,12 +104,14 @@ class JavaProject(SampleImpl):
         uppercase_token = lowercase_token.upper()
         class_name = uppercase_token[0] + lowercase_token[1:]
         source_name = uppercase_token[0] + lowercase_token[1:] + '.java'
-        open(source_name, 'w').write(hello_java_template.format(project_name=self.name,
-                                                                class_name=class_name))
-        open('meson.build', 'w').write(hello_java_meson_template.format(project_name=self.name,
-                                                                        exe_name=class_name,
-                                                                        source_name=source_name,
-                                                                        version=self.version))
+        open(source_name, 'w', encoding='utf-8').write(
+            hello_java_template.format(project_name=self.name,
+                                       class_name=class_name))
+        open('meson.build', 'w', encoding='utf-8').write(
+            hello_java_meson_template.format(project_name=self.name,
+                                             exe_name=class_name,
+                                             source_name=source_name,
+                                             version=self.version))
 
     def create_library(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
@@ -129,6 +131,6 @@ class JavaProject(SampleImpl):
                   'test_name': lowercase_token,
                   'version': self.version,
                   }
-        open(lib_java_name, 'w').write(lib_java_template.format(**kwargs))
-        open(test_java_name, 'w').write(lib_java_test_template.format(**kwargs))
-        open('meson.build', 'w').write(lib_java_meson_template.format(**kwargs))
+        open(lib_java_name, 'w', encoding='utf-8').write(lib_java_template.format(**kwargs))
+        open(test_java_name, 'w', encoding='utf-8').write(lib_java_test_template.format(**kwargs))
+        open('meson.build', 'w', encoding='utf-8').write(lib_java_meson_template.format(**kwargs))
diff --git a/mesonbuild/templates/mesontemplates.py b/mesonbuild/templates/mesontemplates.py
index 4c4d66f..a29ac6f 100644
--- a/mesonbuild/templates/mesontemplates.py
+++ b/mesonbuild/templates/mesontemplates.py
@@ -71,5 +71,5 @@ def create_meson_build(options: argparse.Namespace) -> None:
                                             sourcespec=sourcespec,
                                             depspec=depspec,
                                             default_options=formatted_default_options)
-    open('meson.build', 'w').write(content)
+    open('meson.build', 'w', encoding='utf-8').write(content)
     print('Generated meson.build file:\n\n' + content)
diff --git a/mesonbuild/templates/objcpptemplates.py b/mesonbuild/templates/objcpptemplates.py
index f4f4b51..4f61d6c 100644
--- a/mesonbuild/templates/objcpptemplates.py
+++ b/mesonbuild/templates/objcpptemplates.py
@@ -132,11 +132,12 @@ class ObjCppProject(SampleImpl):
     def create_executable(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
         source_name = lowercase_token + '.mm'
-        open(source_name, 'w').write(hello_objcpp_template.format(project_name=self.name))
-        open('meson.build', 'w').write(hello_objcpp_meson_template.format(project_name=self.name,
-                                                                          exe_name=lowercase_token,
-                                                                          source_name=source_name,
-                                                                          version=self.version))
+        open(source_name, 'w', encoding='utf-8').write(hello_objcpp_template.format(project_name=self.name))
+        open('meson.build', 'w', encoding='utf-8').write(
+            hello_objcpp_meson_template.format(project_name=self.name,
+                                               exe_name=lowercase_token,
+                                               source_name=source_name,
+                                               version=self.version))
 
     def create_library(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
@@ -159,8 +160,8 @@ class ObjCppProject(SampleImpl):
                   'test_name': lowercase_token,
                   'version': self.version,
                   }
-        open(lib_h_name, 'w').write(lib_h_template.format(**kwargs))
-        open(lib_objcpp_name, 'w').write(lib_objcpp_template.format(**kwargs))
-        open(test_objcpp_name, 'w').write(lib_objcpp_test_template.format(**kwargs))
-        open('meson.build', 'w').write(lib_objcpp_meson_template.format(**kwargs))
+        open(lib_h_name, 'w', encoding='utf-8').write(lib_h_template.format(**kwargs))
+        open(lib_objcpp_name, 'w', encoding='utf-8').write(lib_objcpp_template.format(**kwargs))
+        open(test_objcpp_name, 'w', encoding='utf-8').write(lib_objcpp_test_template.format(**kwargs))
+        open('meson.build', 'w', encoding='utf-8').write(lib_objcpp_meson_template.format(**kwargs))
 
diff --git a/mesonbuild/templates/objctemplates.py b/mesonbuild/templates/objctemplates.py
index 4243024..dac638d 100644
--- a/mesonbuild/templates/objctemplates.py
+++ b/mesonbuild/templates/objctemplates.py
@@ -132,11 +132,12 @@ class ObjCProject(SampleImpl):
     def create_executable(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
         source_name = lowercase_token + '.m'
-        open(source_name, 'w').write(hello_objc_template.format(project_name=self.name))
-        open('meson.build', 'w').write(hello_objc_meson_template.format(project_name=self.name,
-                                                                        exe_name=lowercase_token,
-                                                                        source_name=source_name,
-                                                                        version=self.version))
+        open(source_name, 'w', encoding='utf-8').write(hello_objc_template.format(project_name=self.name))
+        open('meson.build', 'w', encoding='utf-8').write(
+            hello_objc_meson_template.format(project_name=self.name,
+                                             exe_name=lowercase_token,
+                                             source_name=source_name,
+                                             version=self.version))
 
     def create_library(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
@@ -159,7 +160,7 @@ class ObjCProject(SampleImpl):
                   'test_name': lowercase_token,
                   'version': self.version,
                   }
-        open(lib_h_name, 'w').write(lib_h_template.format(**kwargs))
-        open(lib_objc_name, 'w').write(lib_objc_template.format(**kwargs))
-        open(test_objc_name, 'w').write(lib_objc_test_template.format(**kwargs))
-        open('meson.build', 'w').write(lib_objc_meson_template.format(**kwargs))
+        open(lib_h_name, 'w', encoding='utf-8').write(lib_h_template.format(**kwargs))
+        open(lib_objc_name, 'w', encoding='utf-8').write(lib_objc_template.format(**kwargs))
+        open(test_objc_name, 'w', encoding='utf-8').write(lib_objc_test_template.format(**kwargs))
+        open('meson.build', 'w', encoding='utf-8').write(lib_objc_meson_template.format(**kwargs))
diff --git a/mesonbuild/templates/rusttemplates.py b/mesonbuild/templates/rusttemplates.py
index 6e99586..95a937c 100644
--- a/mesonbuild/templates/rusttemplates.py
+++ b/mesonbuild/templates/rusttemplates.py
@@ -80,11 +80,12 @@ class RustProject(SampleImpl):
     def create_executable(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
         source_name = lowercase_token + '.rs'
-        open(source_name, 'w').write(hello_rust_template.format(project_name=self.name))
-        open('meson.build', 'w').write(hello_rust_meson_template.format(project_name=self.name,
-                                                                        exe_name=lowercase_token,
-                                                                        source_name=source_name,
-                                                                        version=self.version))
+        open(source_name, 'w', encoding='utf-8').write(hello_rust_template.format(project_name=self.name))
+        open('meson.build', 'w', encoding='utf-8').write(
+            hello_rust_meson_template.format(project_name=self.name,
+                                             exe_name=lowercase_token,
+                                             source_name=source_name,
+                                             version=self.version))
 
     def create_library(self) -> None:
         lowercase_token = re.sub(r'[^a-z0-9]', '_', self.name.lower())
@@ -107,6 +108,6 @@ class RustProject(SampleImpl):
                   'test_name': lowercase_token,
                   'version': self.version,
                   }
-        open(lib_rs_name, 'w').write(lib_rust_template.format(**kwargs))
-        open(test_rs_name, 'w').write(lib_rust_test_template.format(**kwargs))
-        open('meson.build', 'w').write(lib_rust_meson_template.format(**kwargs))
+        open(lib_rs_name, 'w', encoding='utf-8').write(lib_rust_template.format(**kwargs))
+        open(test_rs_name, 'w', encoding='utf-8').write(lib_rust_test_template.format(**kwargs))
+        open('meson.build', 'w', encoding='utf-8').write(lib_rust_meson_template.format(**kwargs))