chore: consistently use open() encoding and file descriptor

nejch · JohnVillalovos · commit dc32d54c49cc · 2022-01-23T07:14:49.000-08:00
diff --git a/gitlab/cli.py b/gitlab/cli.py
@@ -257,8 +257,8 @@ def _parse_value(v: Any) -> Any:
         # If the user-provided value starts with @, we try to read the file
         # path provided after @ as the real value. Exit on any error.
         try:
-            with open(v[1:]) as fl:
-                return fl.read()
+            with open(v[1:]) as f:
+                return f.read()
         except Exception as e:
             sys.stderr.write(f"{e}\n")
             sys.exit(1)
diff --git a/setup.py b/setup.py
@@ -6,16 +6,16 @@
 
 def get_version() -> str:
     version = ""
-    with open("gitlab/_version.py") as f:
+    with open("gitlab/_version.py", "r", encoding="utf-8") as f:
         for line in f:
             if line.startswith("__version__"):
                 version = eval(line.split("=")[-1])
                 break
     return version
 
 
-with open("README.rst", "r") as readme_file:
-    readme = readme_file.read()
+with open("README.rst", "r", encoding="utf-8") as f:
+    readme = f.read()
 
 setup(
     name="python-gitlab",
diff --git a/tests/functional/conftest.py b/tests/functional/conftest.py
@@ -87,7 +87,7 @@ def set_token(container, fixture_dir):
     logging.info("Creating API token.")
     set_token_rb = fixture_dir / "set_token.rb"
 
-    with open(set_token_rb, "r") as f:
+    with open(set_token_rb, "r", encoding="utf-8") as f:
         set_token_command = f.read().strip()
 
     rails_command = [
@@ -206,7 +206,7 @@ def gitlab_config(check_is_alive, docker_ip, docker_services, temp_dir, fixture_
 private_token = {token}
 api_version = 4"""
 
-    with open(config_file, "w") as f:
+    with open(config_file, "w", encoding="utf-8") as f:
         f.write(config)
 
     return config_file
diff --git a/tests/unit/objects/test_todos.py b/tests/unit/objects/test_todos.py
@@ -12,8 +12,8 @@
 
 @pytest.fixture()
 def json_content(fixture_dir):
-    with open(fixture_dir / "todo.json", "r") as json_file:
-        todo_content = json_file.read()
+    with open(fixture_dir / "todo.json", "r", encoding="utf-8") as f:
+        todo_content = f.read()
         return json.loads(todo_content)
 
 
