Issue #198 Fix bug introduced in previous commit: tests/rest/auth/test_config.py:163: AttributeError

AttributeError: 'function' object has no attribute 'st_mode'

Author: JohanKJSchreurs

openeo/rest/auth/config.py

@@ -29,6 +29,7 @@ def assert_private_file(path: Path):
     """Check that given file is only readable by user."""
 
     # use oschmod on Windows
+    # TODO: can we use oschmod for all operating systems, make the code simpler and consitent?
     if platform.system() == "Windows":
         mode = oschmod.get_mode(str(path))
     else:
@@ -38,10 +39,6 @@ def assert_private_file(path: Path):
             p=path, a=mode & (stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO), e=_PRIVATE_PERMS
         )
         raise PermissionError(message)
-        # if platform.system() == 'Windows':
-        #     log.info(message)
-        # else:
-        #     raise PermissionError(message)
 
 
 def utcnow_rfc3339() -> str:
@@ -94,7 +91,8 @@ def _write(self, data: dict):
         # TODO: add file locking to avoid race conditions?
         with self._path.open("w", encoding="utf8") as f:
             json.dump(data, f, indent=2)
-        # on Windows us oschmod because Python chmod implementation doesn't work on Windows.
+        # On Windows we use oschmod because Python chmod implementation doesn't work on Windows.
+        # TODO: can we use oschmod on all platforms? Seems like that is the intention of oschmod.
         if platform.system() == "Windows":
             oschmod.set_mode(str(self._path), mode=_PRIVATE_PERMS)
         else:

setup.py

@@ -47,7 +47,7 @@
           'xarray>=0.12.3',
           'pandas>0.20.0',
           'deprecated>=1.2.12',
-          'oschmod; sys_platform == "win32"',
+          'oschmod',
           'pywin32; sys_platform == "win32"',
       ],
       extras_require={

tests/rest/auth/test_config.py

@@ -160,7 +160,7 @@ def test_permissions(self, tmp_path):
         if platform.system() == 'Windows':
             st_mode = oschmod.get_mode(str(token_path))
         else:
-            token_path.stat.st_mode()
+            token_path.stat().st_mode
             st_mode = (tmp_path / RefreshTokenStore.DEFAULT_FILENAME).stat().st_mode
         assert st_mode & 0o777 == 0o600
 

tests/test_config.py

@@ -1,6 +1,7 @@
 import contextlib
 import logging
 import os
+import platform
 import random
 import re
 import textwrap
@@ -159,9 +160,9 @@ def test_get_config_verbose(tmp_path, caplog, capsys, verbose, force_interactive
         config = get_config()
         assert config.get("general.verbose") == verbose
 
-    # TODO: on Windows the path in config_path makes the regex invalid.
-    #   My guess is the \ from the path is interpreted as an escape sequence
-    import platform
+    # On Windows the path in config_path would make the regex invalid because
+    # windows paths contain \ and a regex interprets that as an escape sequence.
+    # Therefore we have to escape the \ to \\ .
     if platform.system() == "Windows":
         config_path_escaped = str(config_path).replace("\\", "\\\\")
     else: