Merge pull request #91 from arsenetar/as/misc-fixes

chore: Upgrade version to 1.8.3, bump CI

.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@v4
       - name: Set up Python 3.x
-      uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - name: Install dependencies
@@ -31,36 +31,36 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            python-version: 3.10.0-alpha - 3.10.0
+            python-version: 3.12
+          - os: ubuntu-latest
+            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
-            python-version: 3.6
-          - os: ubuntu-latest
-            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
+          # - os: macos-latestgit push
           #   python-version: 3.8
           # - os: macos-latest
           #   python-version: 2.7
           - os: windows-latest
-            python-version: 3.9
+            python-version: 3.12
           - os: windows-latest
             python-version: 3.8
           - os: windows-latest
             python-version: 2.7
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+        uses: LizardByte/setup-python-action@master
         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,20 @@
 Changes
 =======
 
+Version 1.8.3 -- 2024/04/06
+---------------------------
+* Add support for any iterable type as input by @PalmtopTiger in https://github.com/arsenetar/send2trash/pull/88
+* fix: Use os.fsdecode() for arguments to shutil.move() by @yogeshiitm in https://github.com/arsenetar/send2trash/pull/90
+
+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
 ---------------------------

pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools >= 40.6.0", "wheel"]
+requires = ["setuptools >= 40.6.0"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]

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 .mac import send2trash
+    from send2trash.mac import send2trash
 elif sys.platform == "win32":
-    from .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/compat.py

@@ -18,3 +18,8 @@ else:
     text_type = unicode  # noqa: F821
     binary_type = str
     environb = os.environ
+
+try:
+    from collections.abc import Iterable as iterable_type
+except ImportError:
+    from collections import Iterable as iterable_type  # 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 .modern import send2trash
+        from send2trash.mac.modern import send2trash
     except ImportError:
         # Try to fall back to ctypes version, although likely problematic still
-        from .legacy import send2trash
+        from send2trash.mac.legacy import send2trash
 else:
     # Just use the old version otherwise
-    from .legacy 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
@@ -115,7 +115,7 @@ def trash_move(src, dst, topdir=None, cross_dev=False):
         f.write(info_for(src, topdir))
     destpath = op.join(filespath, destname)
     if cross_dev:
-        shutil.move(src, destpath)
+        shutil.move(fsdecode(src), fsdecode(destpath))
     else:
         os.rename(src, destpath)
 

send2trash/util.py

@@ -5,9 +5,13 @@
 # which should be included with this package. The terms are also available at
 # http://www.hardcoded.net/licenses/bsd_license
 
+from send2trash.compat import text_type, binary_type, iterable_type
+
 
 def preprocess_paths(paths):
-    if not isinstance(paths, list):
+    if isinstance(paths, iterable_type) and not isinstance(paths, (text_type, binary_type)):
+        paths = list(paths)
+    elif not isinstance(paths, list):
         paths = [paths]
     # Convert items such as pathlib paths to strings
     paths = [path.__fspath__() if hasattr(path, "__fspath__") else path for path in paths]

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 .modern import send2trash
+        from send2trash.win.modern import send2trash
     except ImportError:
         # use SHFileOperation as fallback
-        from .legacy import send2trash
+        from send2trash.win.legacy import send2trash
 else:
     # use SHFileOperation as fallback
-    from .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,
@@ -85,10 +86,7 @@ def convert_sh_file_opt_result(result):
         0x10074: 0x57,  # DE_ROOTDIR | ERRORONDEST -> ERROR_INVALID_PARAMETER
     }
 
-    if result in results.keys():
+    return results.get(result, result)
-        return results[result]
-    else:
-        return result
 
 
 def prefix_and_path(path):
@@ -142,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

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

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Send2Trash
-version = 1.8.1b0
+version = 1.8.3
 url = https://github.com/arsenetar/send2trash
 project_urls = 
     Bug Reports = https://github.com/arsenetar/send2trash/issues
@@ -20,22 +20,28 @@ classifiers =
     Operating System :: POSIX
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
+    Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
     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.*
+python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, !=3.5.*, !=3.6.*
+
+[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_win.py

@@ -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)