Replace codecs.open with built-in open for UTF-8 file handling

fluent.runtime/fluent/runtime/fallback.py

@@ -1,4 +1,3 @@
-import codecs
 import os
 from typing import (
     TYPE_CHECKING,
@@ -134,7 +133,7 @@ def resources(
                 path = self.localize_path(os.path.join(root, resource_id), locale)
                 if not os.path.isfile(path):
                     continue
-                content = codecs.open(path, "r", "utf-8").read()
+                content = open(path, "r", encoding="utf-8").read()
                 resources.append(FluentParser().parse(content))
             if resources:
                 yield resources

fluent.runtime/tests/test_utils.py

@@ -1,7 +1,6 @@
 import unittest
 from .utils import patch_files
 import os
-import codecs
 
 
 class TestFileSimulate(unittest.TestCase):
@@ -38,5 +37,5 @@ def assertFileIs(self, filename, expect_contents):
         else:
             self.assertTrue(os.path.isfile(filename),
                             f"Expected {filename} to exist.")
-            with codecs.open(filename, "r", "utf-8") as f:
+            with open(filename, "r", encoding="utf-8") as f:
                 self.assertEqual(f.read(), expect_contents)

fluent.runtime/tests/utils.py

@@ -42,9 +42,14 @@ def patch_files(files: dict):
 
     def then(func):
         @mock.patch("os.path.isfile", side_effect=lambda p: _normalize_file_path(p) in files)
-        @mock.patch("codecs.open", side_effect=lambda p, _, __: StringIO(files[_normalize_file_path(p)]))
+        @mock.patch(
+            "builtins.open",
+            side_effect=lambda p, *a, **kw: StringIO(files[_normalize_file_path(p)]),
+        )
         @functools.wraps(func)  # Make ret look like func to later decorators
         def ret(*args, **kwargs):
             func(*args[:-2], **kwargs)
+
         return ret
+
     return then

fluent.syntax/tests/syntax/test_reference.py

@@ -1,4 +1,3 @@
-import codecs
 import json
 import os
 import unittest
@@ -7,7 +6,7 @@
 
 
 def read_file(path):
-    with codecs.open(path, "r", encoding="utf-8") as file:
+    with open(path, "r", encoding="utf-8") as file:
         text = file.read()
     return text
 

fluent.syntax/tests/syntax/test_structure.py

@@ -1,4 +1,3 @@
-import codecs
 import json
 import os
 import unittest
@@ -7,7 +6,7 @@
 
 
 def read_file(path):
-    with codecs.open(path, "r", encoding="utf-8") as file:
+    with open(path, "r", encoding="utf-8") as file:
         text = file.read()
     return text
 

tools/fluentfmt.py

@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-import codecs
 import sys
 
 from fluent.syntax import parse, serialize
@@ -9,7 +8,7 @@
 
 
 def read_file(path):
-    with codecs.open(path, "r", encoding="utf-8") as file:
+    with open(path, "r", encoding="utf-8") as file:
         text = file.read()
     return text
 

tools/parse.py

@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-import codecs
 import json
 import sys
 
@@ -10,7 +9,7 @@
 
 
 def read_file(path):
-    with codecs.open(path, "r", encoding="utf-8") as file:
+    with open(path, "r", encoding="utf-8") as file:
         text = file.read()
     return text
 

tools/serialize.py

@@ -1,6 +1,5 @@
 #!/usr/bin/python
 
-import codecs
 import json
 import sys
 
@@ -10,7 +9,7 @@
 
 
 def read_json(path):
-    with codecs.open(path, "r", encoding="utf-8") as file:
+    with open(path, "r", encoding="utf-8") as file:
         return json.load(file)