fix(build): Fix syntax in setup.cfg, add python 3.11

fix(ci): Update to latest actions, fix python versions

.github/workflows/codeql-analysis.yml

@@ -18,7 +18,7 @@ on:
     # The branches below must be a subset of the branches above
     branches: [master]
   schedule:
-    - cron: '25 5 * * 4'
+    - cron: "25 5 * * 4"
 
 jobs:
   analyze:
@@ -32,18 +32,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'python' ]
+        language: ["python"]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
 
     steps:
       - name: Checkout repository
-      uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+        uses: github/codeql-action/autobuild@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

.github/workflows/default.yml

@@ -12,9 +12,9 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python 3.x
-      uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: 3.x
       - name: Install dependencies
@@ -31,36 +31,38 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            python-version: 3.10.0-alpha - 3.10.0
+            python-version: 3.11
+          - os: ubuntu-latest
+            python-version: "3.10"
           - os: ubuntu-latest
             python-version: 3.9
           - os: ubuntu-latest
             python-version: 3.8
           - os: ubuntu-latest
             python-version: 3.7
-          - os: ubuntu-latest
+          - os: ubuntu-20.04
             python-version: 3.6
-          - os: ubuntu-latest
+          - os: ubuntu-20.04
             python-version: 3.5
           - os: ubuntu-latest
             python-version: 2.7
           # - os: macos-latest
-          #   python-version: 3.9
+          #   python-version: 3.11
           # - os: macos-latest
           #   python-version: 3.8
           # - os: macos-latest
           #   python-version: 2.7
           - os: windows-latest
-            python-version: 3.9
+            python-version: 3.11
           - os: windows-latest
             python-version: 3.8
           - os: windows-latest
             python-version: 2.7
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

.travis.yml

@@ -1,19 +0,0 @@
-language: python
-matrix:
-  include:
-    - python: "2.7"
-      arch: ppc64le
-    - python: "3.6"
-      arch: ppc64le
-    - python: "3.7"
-      arch: ppc64le
-    - python: "3.8"
-      arch: ppc64le
-    - python: "3.9"
-      arch: ppc64le
-install:
-  - python -m pip install tox
-before_script:
-  - export TOXENV=$(echo py$TRAVIS_PYTHON_VERSION | tr -d .)
-script:
-  - python -m tox

CHANGES.rst

@@ -1,9 +1,15 @@
 Changes
 =======
 
+Version 1.8.2 -- 2023/04/27
+---------------------------
+* win/legacy: tiny logic simplification by @BoboTiG in https://github.com/arsenetar/send2trash/pull/77
+* TravisCI is not used anymore by @sobolevn in https://github.com/arsenetar/send2trash/pull/73
+* fix(ci): Update to latest actions, fix python versions by @arsenetar in https://github.com/arsenetar/send2trash/pull/78
+
 Version 1.8.1b0 -- 2021/09/20
 -----------------------------
-* Add fallback to HOMETRASH when cross device errors happen in plat_other (#26, $41, #63)
+* Add fallback to HOMETRASH when cross device errors happen in plat_other (#26, #41, #63)
 
 Version 1.8.0 -- 2021/08/08
 ---------------------------

send2trash/__init__.py

@@ -6,16 +6,16 @@
 
 import sys
 
-from .exceptions import TrashPermissionError  # noqa: F401
+from send2trash.exceptions import TrashPermissionError  # noqa: F401
 
 if sys.platform == "darwin":
-    from .plat_osx import send2trash
+    from send2trash.mac import send2trash
 elif sys.platform == "win32":
-    from .plat_win import send2trash
+    from send2trash.win import send2trash
 else:
     try:
         # If we can use gio, let's use it
-        from .plat_gio import send2trash
+        from send2trash.plat_gio import send2trash
     except ImportError:
         # Oh well, let's fallback to our own Freedesktop trash implementation
-        from .plat_other import send2trash  # noqa: F401
+        from send2trash.plat_other import send2trash  # noqa: F401

send2trash/exceptions.py

@@ -1,5 +1,5 @@
 import errno
-from .compat import PY3
+from send2trash.compat import PY3
 
 if PY3:
     _permission_error = PermissionError  # noqa: F821

send2trash/mac/__init__.py

@@ -11,10 +11,10 @@ from sys import version_info
 macos_ver = tuple(int(part) for part in mac_ver()[0].split("."))
 if version_info >= (3, 6) and macos_ver >= (10, 9):
     try:
-        from .plat_osx_pyobjc import send2trash
+        from send2trash.mac.modern import send2trash
     except ImportError:
         # Try to fall back to ctypes version, although likely problematic still
-        from .plat_osx_ctypes import send2trash
+        from send2trash.mac.legacy import send2trash
 else:
     # Just use the old version otherwise
-    from .plat_osx_ctypes import send2trash  # noqa: F401
+    from send2trash.mac.legacy import send2trash  # noqa: F401

send2trash/mac/legacy.py

@@ -9,8 +9,8 @@ from __future__ import unicode_literals
 from ctypes import cdll, byref, Structure, c_char, c_char_p
 from ctypes.util import find_library
 
-from .compat import binary_type
+from send2trash.compat import binary_type
-from .util import preprocess_paths
+from send2trash.util import preprocess_paths
 
 Foundation = cdll.LoadLibrary(find_library("Foundation"))
 CoreServices = cdll.LoadLibrary(find_library("CoreServices"))

send2trash/mac/modern.py

@@ -5,8 +5,8 @@
 # http://www.hardcoded.net/licenses/bsd_license
 
 from Foundation import NSFileManager, NSURL
-from .compat import text_type
+from send2trash.compat import text_type
-from .util import preprocess_paths
+from send2trash.util import preprocess_paths
 
 
 def check_op_result(op_result):

send2trash/plat_gio.py

@@ -5,8 +5,8 @@
 # http://www.hardcoded.net/licenses/bsd_license
 
 from gi.repository import GObject, Gio
-from .exceptions import TrashPermissionError
+from send2trash.exceptions import TrashPermissionError
-from .util import preprocess_paths
+from send2trash.util import preprocess_paths
 
 
 def send2trash(paths):

send2trash/plat_other.py

@@ -30,9 +30,9 @@ except ImportError:
     # Python 2
     from urllib import quote
 
-from .compat import text_type, environb
+from send2trash.compat import text_type, environb
-from .util import preprocess_paths
+from send2trash.util import preprocess_paths
-from .exceptions import TrashPermissionError
+from send2trash.exceptions import TrashPermissionError
 
 try:
     fsencode = os.fsencode  # Python 3
@@ -182,26 +182,23 @@ def send2trash(paths):
             path_b = fsencode(path)
         elif isinstance(path, bytes):
             path_b = path
-        elif hasattr(path, "__fspath__"):
-            # Python 3.6 PathLike protocol
-            return send2trash(path.__fspath__())
         else:
             raise TypeError("str, bytes or PathLike expected, not %r" % type(path))
 
         if not op.exists(path_b):
-            raise OSError("File not found: %s" % path)
+            raise OSError(errno.ENOENT, "File not found: %s" % path)
         # ...should check whether the user has the necessary permissions to delete
         # it, before starting the trashing operation itself. [2]
         if not os.access(path_b, os.W_OK):
-            raise OSError("Permission denied: %s" % path)
+            raise OSError(errno.EACCES, "Permission denied: %s" % path)
-        # if the file to be trashed is on the same device as HOMETRASH we
-        # want to move it there.
-        path_dev = get_dev(path_b)
 
+        path_dev = get_dev(path_b)
         # If XDG_DATA_HOME or HOMETRASH do not yet exist we need to stat the
         # home directory, and these paths will be created further on if needed.
         trash_dev = get_dev(op.expanduser(b"~"))
 
+        # if the file to be trashed is on the same device as HOMETRASH we
+        # want to move it there.
         if path_dev == trash_dev:
             topdir = XDG_DATA_HOME
             dest_trash = HOMETRASH_B

send2trash/win/__init__.py

@@ -11,10 +11,10 @@ from platform import version
 if int(version().split(".", 1)[0]) >= 6:
     try:
         # Attempt to use pywin32 to use IFileOperation
-        from .plat_win_modern import send2trash
+        from send2trash.win.modern import send2trash
     except ImportError:
         # use SHFileOperation as fallback
-        from .plat_win_legacy import send2trash
+        from send2trash.win.legacy import send2trash
 else:
     # use SHFileOperation as fallback
-    from .plat_win_legacy import send2trash  # noqa: F401
+    from send2trash.win.legacy import send2trash  # noqa: F401

send2trash/win/legacy.py

@@ -6,8 +6,9 @@
 
 from __future__ import unicode_literals
 import os.path as op
-from .compat import text_type
+
-from .util import preprocess_paths
+from send2trash.compat import text_type
+from send2trash.util import preprocess_paths
 
 from ctypes import (
     windll,
@@ -53,6 +54,41 @@ FOF_ALLOWUNDO = 64
 FOF_NOERRORUI = 1024
 
 
+def convert_sh_file_opt_result(result):
+    # map overlapping values from SHFileOpterationW to approximate standard windows errors
+    # ref https://docs.microsoft.com/en-us/windows/win32/api/shellapi/nf-shellapi-shfileoperationw#return-value
+    # ref https://docs.microsoft.com/en-us/windows/win32/debug/system-error-codes--0-499-
+    results = {
+        0x71: 0x50,  # DE_SAMEFILE -> ERROR_FILE_EXISTS
+        0x72: 0x57,  # DE_MANYSRC1DEST -> ERROR_INVALID_PARAMETER
+        0x73: 0x57,  # DE_DIFFDIR -> ERROR_INVALID_PARAMETER
+        0x74: 0x57,  # DE_ROOTDIR -> ERROR_INVALID_PARAMETER
+        0x75: 0x4C7,  # DE_OPCANCELLED -> ERROR_CANCELLED
+        0x76: 0x57,  # DE_DESTSUBTREE -> ERROR_INVALID_PARAMETER
+        0x78: 0x05,  # DE_ACCESSDENIEDSRC -> ERROR_ACCESS_DENIED
+        0x79: 0x6F,  # DE_PATHTOODEEP -> ERROR_BUFFER_OVERFLOW
+        0x7A: 0x57,  # DE_MANYDEST -> ERROR_INVALID_PARAMETER
+        0x7C: 0xA1,  # DE_INVALIDFILES -> ERROR_BAD_PATHNAME
+        0x7D: 0x57,  # DE_DESTSAMETREE -> ERROR_INVALID_PARAMETER
+        0x7E: 0xB7,  # DE_FLDDESTISFILE -> ERROR_ALREADY_EXISTS
+        0x80: 0xB7,  # DE_FILEDESTISFLD -> ERROR_ALREADY_EXISTS
+        0x81: 0x6F,  # DE_FILENAMETOOLONG -> ERROR_BUFFER_OVERFLOW
+        0x82: 0x13,  # DE_DEST_IS_CDROM -> ERROR_WRITE_PROTECT
+        0x83: 0x13,  # DE_DEST_IS_DVD -> ERROR_WRITE_PROTECT
+        0x84: 0x6F9,  # DE_DEST_IS_CDRECORD -> ERROR_UNRECOGNIZED_MEDIA
+        0x85: 0xDF,  # DE_FILE_TOO_LARGE -> ERROR_FILE_TOO_LARGE
+        0x86: 0x13,  # DE_SRC_IS_CDROM -> ERROR_WRITE_PROTECT
+        0x87: 0x13,  # DE_SRC_IS_DVD -> ERROR_WRITE_PROTECT
+        0x88: 0x6F9,  # DE_SRC_IS_CDRECORD -> ERROR_UNRECOGNIZED_MEDIA
+        0xB7: 0x6F,  # DE_ERROR_MAX -> ERROR_BUFFER_OVERFLOW
+        0x402: 0xA1,  # UNKNOWN -> ERROR_BAD_PATHNAME
+        0x10000: 0x1D,  # ERRORONDEST -> ERROR_WRITE_FAULT
+        0x10074: 0x57,  # DE_ROOTDIR | ERRORONDEST -> ERROR_INVALID_PARAMETER
+    }
+
+    return results.get(result, result)
+
+
 def prefix_and_path(path):
     r"""Guess the long-path prefix based on the kind of *path*.
     Local paths (C:\folder\file.ext) and UNC names (\\server\folder\file.ext)
@@ -104,6 +140,8 @@ def get_short_path_name(long_name):
 
 def send2trash(paths):
     paths = preprocess_paths(paths)
+    if not paths:
+        return
     # convert data type
     paths = [text_type(path, "mbcs") if not isinstance(path, text_type) else path for path in paths]
     # convert to full paths
@@ -141,4 +179,5 @@ def send2trash(paths):
     fileop.lpszProgressTitle = None
     result = SHFileOperationW(byref(fileop))
     if result:
-        raise WindowsError(result, FormatError(result), paths)
+        error = convert_sh_file_opt_result(result)
+        raise WindowsError(None, FormatError(error), paths, error)

send2trash/win/modern.py

@@ -6,17 +6,19 @@
 
 from __future__ import unicode_literals
 import os.path as op
-from .compat import text_type
+from send2trash.compat import text_type
-from .util import preprocess_paths
+from send2trash.util import preprocess_paths
 from platform import version
 import pythoncom
 import pywintypes
 from win32com.shell import shell, shellcon
-from .IFileOperationProgressSink import create_sink
+from send2trash.win.IFileOperationProgressSink import create_sink
 
 
 def send2trash(paths):
     paths = preprocess_paths(paths)
+    if not paths:
+        return
     # convert data type
     paths = [text_type(path, "mbcs") if not isinstance(path, text_type) else path for path in paths]
     # convert to full paths
@@ -27,7 +29,10 @@ def send2trash(paths):
     pythoncom.CoInitialize()
     # create instance of file operation object
     fileop = pythoncom.CoCreateInstance(
-        shell.CLSID_FileOperation, None, pythoncom.CLSCTX_ALL, shell.IID_IFileOperation,
+        shell.CLSID_FileOperation,
+        None,
+        pythoncom.CLSCTX_ALL,
+        shell.IID_IFileOperation,
     )
     # default flags to use
     flags = shellcon.FOF_NOCONFIRMATION | shellcon.FOF_NOERRORUI | shellcon.FOF_SILENT | shellcon.FOFX_EARLYFAILURE

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Send2Trash
-version = 1.8.1b0
+version = 1.8.2
 url = https://github.com/arsenetar/send2trash
 project_urls = 
     Bug Reports = https://github.com/arsenetar/send2trash/issues
@@ -26,16 +26,23 @@ classifiers =
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
     Topic :: Desktop Environment :: File Managers
 
 [options]
-packages = send2trash
+packages = find:
 tests_require = pytest
 python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*
 
+[options.packages.find]
+include=
+    send2trash*
+
 [options.extras_require]
-win32 = pywin32; sys_platform == "win32"
+win32 = 
-objc = pyobjc-framework-Cocoa; sys_platform == "darwin"
+    pywin32; sys_platform == "win32"
+objc = 
+    pyobjc-framework-Cocoa; sys_platform == "darwin"
 nativeLib = 
     pywin32; sys_platform == "win32"
     pyobjc-framework-Cocoa; sys_platform == "darwin"

tests/test_plat_other.py

@@ -22,6 +22,7 @@ if sys.platform != "win32":
     import send2trash.plat_other
     from send2trash.plat_other import send2trash as s2t
 
+    INFO_SUFFIX = send2trash.plat_other.INFO_SUFFIX.decode()
     HOMETRASH = send2trash.plat_other.HOMETRASH
 else:
     pytest.skip("Skipping non-windows tests", allow_module_level=True)
@@ -39,7 +40,7 @@ def testfile():
         # Remove trash files if they exist
         if op.exists(op.join(HOMETRASH, "files", name)):
             os.remove(op.join(HOMETRASH, "files", name))
-            os.remove(op.join(HOMETRASH, "info", name + ".trashinfo"))
+            os.remove(op.join(HOMETRASH, "info", name + INFO_SUFFIX))
     if op.exists(file.name):
         os.remove(file.name)
 
@@ -49,7 +50,9 @@ def testfiles():
     files = list(
         map(
             lambda index: NamedTemporaryFile(
-                dir=op.expanduser("~"), prefix="send2trash_test{}".format(index), delete=False,
+                dir=op.expanduser("~"),
+                prefix="send2trash_test{}".format(index),
+                delete=False,
             ),
             range(10),
         )
@@ -59,7 +62,7 @@ def testfiles():
     yield files
     filenames = [op.basename(file.name) for file in files]
     [os.remove(op.join(HOMETRASH, "files", filename)) for filename in filenames]
-    [os.remove(op.join(HOMETRASH, "info", filename + ".trashinfo")) for filename in filenames]
+    [os.remove(op.join(HOMETRASH, "info", filename + INFO_SUFFIX)) for filename in filenames]
 
 
 def test_trash(testfile):
@@ -94,7 +97,7 @@ def gen_unicode_file():
     # Cleanup trash files on supported platforms
     if sys.platform != "win32" and op.exists(op.join(HOMETRASH, "files", name)):
         os.remove(op.join(HOMETRASH, "files", name))
-        os.remove(op.join(HOMETRASH, "info", name + ".trashinfo"))
+        os.remove(op.join(HOMETRASH, "info", name + INFO_SUFFIX))
     if op.exists(file):
         os.remove(file)
 
@@ -128,7 +131,10 @@ class ExtVol:
             return st.st_dev
 
         def s_ismount(path):
-            if op.realpath(path) in (op.realpath(self.trash_topdir), op.realpath(self.trash_topdir_b),):
+            if op.realpath(path) in (
+                op.realpath(self.trash_topdir),
+                op.realpath(self.trash_topdir_b),
+            ):
                 return True
             return old_ismount(path)
 
@@ -162,11 +168,21 @@ def test_trash_topdir(gen_ext_vol):
     s2t(gen_ext_vol[2])
     assert op.exists(gen_ext_vol[2]) is False
     assert op.exists(op.join(trash_dir, str(os.getuid()), "files", gen_ext_vol[1])) is True
-    assert op.exists(op.join(trash_dir, str(os.getuid()), "info", gen_ext_vol[1] + ".trashinfo",)) is True
+    assert (
+        op.exists(
+            op.join(
+                trash_dir,
+                str(os.getuid()),
+                "info",
+                gen_ext_vol[1] + INFO_SUFFIX,
+            )
+        )
+        is True
+    )
     # info relative path (if another test is added, with the same fileName/Path,
     # then it gets renamed etc.)
     cfg = ConfigParser()
-    cfg.read(op.join(trash_dir, str(os.getuid()), "info", gen_ext_vol[1] + ".trashinfo"))
+    cfg.read(op.join(trash_dir, str(os.getuid()), "info", gen_ext_vol[1] + INFO_SUFFIX))
     assert (gen_ext_vol[1] == cfg.get("Trash Info", "Path", raw=True)) is True
 
 
@@ -174,7 +190,15 @@ def test_trash_topdir_fallback(gen_ext_vol):
     s2t(gen_ext_vol[2])
     assert op.exists(gen_ext_vol[2]) is False
     assert (
-        op.exists(op.join(gen_ext_vol[0].trash_topdir, ".Trash-" + str(os.getuid()), "files", gen_ext_vol[1],)) is True
+        op.exists(
+            op.join(
+                gen_ext_vol[0].trash_topdir,
+                ".Trash-" + str(os.getuid()),
+                "files",
+                gen_ext_vol[1],
+            )
+        )
+        is True
     )
 
 
@@ -194,6 +218,14 @@ def test_trash_symlink(gen_ext_vol):
     s2t(op.join(sl_dir, gen_ext_vol[1]))
     assert op.exists(file_path) is False
     assert (
-        op.exists(op.join(gen_ext_vol[0].trash_topdir, ".Trash-" + str(os.getuid()), "files", gen_ext_vol[1],)) is True
+        op.exists(
+            op.join(
+                gen_ext_vol[0].trash_topdir,
+                ".Trash-" + str(os.getuid()),
+                "files",
+                gen_ext_vol[1],
+            )
+        )
+        is True
     )
     os.remove(sl_dir)

tests/test_plat_win.py

@@ -9,8 +9,8 @@ from send2trash import send2trash as s2t
 
 # import the two versions as well as the "automatic" version
 if sys.platform == "win32":
-    from send2trash.plat_win_modern import send2trash as s2t_modern
+    from send2trash.win.modern import send2trash as s2t_modern
-    from send2trash.plat_win_legacy import send2trash as s2t_legacy
+    from send2trash.win.legacy import send2trash as s2t_legacy
 else:
     pytest.skip("Skipping windows-only tests", allow_module_level=True)
 
@@ -204,3 +204,17 @@ def test_trash_long_multifile_legacy(longfiles):
 #     )
 #     def test_trash_long_folder_legacy(self):
 #         self._trash_folder(s2t_legacy)
+
+
+def test_trash_nothing_legacy():
+    try:
+        s2t_legacy([])
+    except Exception as ex:
+        assert False, "Exception thrown when trashing nothing: {}".format(ex)
+
+
+def test_trash_nothing_modern():
+    try:
+        s2t_modern([])
+    except Exception as ex:
+        assert False, "Exception thrown when trashing nothing: {}".format(ex)