Inline shim enum.auto; document shims for os.fwalk and os.O_DIRECTORY

Author: c0llab0rat0r

ipfshttpclient/filescanner.py

@@ -21,12 +21,11 @@
 	re_pattern_t = re_pattern_type = type(re.compile(""))
 
 
-enum_auto = enum.auto
-
-
-O_DIRECTORY = getattr(os, "O_DIRECTORY", 0)  # type: int
+# Windows does not have os.O_DIRECTORY
+O_DIRECTORY: int = getattr(os, "O_DIRECTORY", 0)
 
 
+# Mac does not have os.fwalk even thru Python 3.9
 HAVE_FWALK: bool = hasattr(os, "fwalk")
 HAVE_FWALK_BYTES = HAVE_FWALK and sys.version_info >= (3, 7)
 
@@ -410,8 +409,8 @@ def matcher_from_spec(spec: match_spec_t[ty.AnyStr], *,  # type: ignore[misc]  #
 	from .filescanner_ty import FSNodeType, FSNodeEntry
 else:
 	class FSNodeType(enum.Enum):
-		FILE = enum_auto()
-		DIRECTORY = enum_auto()
+		FILE = enum.auto()
+		DIRECTORY = enum.auto()
 
 	FSNodeEntry = ty.NamedTuple("FSNodeEntry", [
 		("type", FSNodeType),

test/functional/test_files.py

@@ -1,6 +1,5 @@
 import os
 import shutil
-import sys
 import tempfile
 
 import pytest
@@ -12,7 +11,8 @@
 import conftest
 
 
-O_DIRECTORY = getattr(os, "O_DIRECTORY", 0)  # type: int
+# Windows does not have os.O_DIRECTORY
+O_DIRECTORY: int = getattr(os, "O_DIRECTORY", 0)
 
 
 ### test_add_multiple_from_list
@@ -263,15 +263,15 @@ def test_add_filepattern_from_dirname(client, cleanup_pins):
                     reason="No point in disabling os.fwalk if it isn't actually supported")
 def test_add_filepattern_from_dirname_nofwalk(client, cleanup_pins, monkeypatch):
 	monkeypatch.setattr(ipfshttpclient.filescanner, "HAVE_FWALK", False)
-	
+
 	res = client.add(FAKE_DIR_PATH, pattern=FAKE_DIR_FNPATTERN1)
 	assert conftest.sort_by_key(res) == conftest.sort_by_key(FAKE_DIR_FNPATTERN1_HASH)
 
 
 @pytest.mark.skipif(not ipfshttpclient.filescanner.HAVE_FWALK,
                     reason="Passing directory as file descriptor requires os.fwalk")
 def test_add_filepattern_from_dirfd(client, cleanup_pins):
-	fd = os.open(str(FAKE_DIR_PATH), os.O_RDONLY | O_DIRECTORY)  # type: int
+	fd: int = os.open(str(FAKE_DIR_PATH), os.O_RDONLY | O_DIRECTORY)
 	try:
 		res = client.add(fd, pattern=FAKE_DIR_FNPATTERN1)
 	finally:
@@ -288,18 +288,18 @@ def test_add_filepattern_from_dirname_recursive(client, cleanup_pins):
                     reason="No point in disabling os.fwalk if it isn't actually supported")
 def test_add_filepattern_from_dirname_recursive_nofwalk(client, cleanup_pins, monkeypatch):
 	monkeypatch.setattr(ipfshttpclient.filescanner, "HAVE_FWALK", False)
-	
+
 	res = client.add(FAKE_DIR_PATH, pattern=FAKE_DIR_FNPATTERN1, recursive=True)
 	assert conftest.sort_by_key(res) == conftest.sort_by_key(FAKE_DIR_FNPATTERN1_RECURSIVE_HASH)
 
 
-@pytest.mark.skipif(sys.platform.startswith("win"),
+@pytest.mark.skipif(not O_DIRECTORY,
                     reason="Opening directory FDs does not work on Windows")
 def test_add_filepattern_from_dirfd_recursive_nofwalk(client, cleanup_pins, monkeypatch):
 	monkeypatch.setattr(ipfshttpclient.filescanner, "HAVE_FWALK", False)
-	
+
 	with pytest.raises(NotImplementedError):
-		fd = os.open(str(FAKE_DIR_PATH), os.O_RDONLY | O_DIRECTORY)  # type: int
+		fd: int = os.open(str(FAKE_DIR_PATH), os.O_RDONLY | O_DIRECTORY)
 		try:
 			client.add(fd, pattern=FAKE_DIR_FNPATTERN1, recursive=True)
 		finally:
@@ -309,7 +309,7 @@ def test_add_filepattern_from_dirfd_recursive_nofwalk(client, cleanup_pins, monk
 @pytest.mark.skipif(not ipfshttpclient.filescanner.HAVE_FWALK,
                     reason="Passing directory as file descriptor requires os.fwalk")
 def test_add_filepattern_from_dirfd_recursive(client, cleanup_pins):
-	fd = os.open(str(FAKE_DIR_PATH), os.O_RDONLY | O_DIRECTORY)  # type: int
+	fd: int = os.open(str(FAKE_DIR_PATH), os.O_RDONLY | O_DIRECTORY)
 	try:
 		res = client.add(fd, pattern=FAKE_DIR_FNPATTERN1, recursive=True)
 	finally:
@@ -327,7 +327,7 @@ def test_add_filepattern_from_dirname_recursive_binary(client, cleanup_pins):
                     reason="No point in disabling os.fwalk if it isn't actually supported")
 def test_add_filepattern_from_dirname_recursive_nofwalk_binary(client, cleanup_pins, monkeypatch):
 	monkeypatch.setattr(ipfshttpclient.filescanner, "HAVE_FWALK", False)
-	
+
 	res = client.add(os.fsencode(str(FAKE_DIR_PATH)),
 	                 pattern=os.fsencode(FAKE_DIR_FNPATTERN1), recursive=True)
 	assert conftest.sort_by_key(res) == conftest.sort_by_key(FAKE_DIR_FNPATTERN1_RECURSIVE_HASH)