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

chore: Upgrade version to 1.8.3, bump CI

.github/workflows/default.yml

@@ -12,9 +12,9 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python 3.x
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v5
         with:
           python-version: 3.x
       - name: Install dependencies
@@ -30,6 +30,8 @@ jobs:
     strategy:
       matrix:
         include:
+          - os: ubuntu-latest
+            python-version: 3.12
           - os: ubuntu-latest
             python-version: 3.11
           - os: ubuntu-latest
@@ -40,29 +42,25 @@ jobs:
             python-version: 3.8
           - os: ubuntu-latest
             python-version: 3.7
-          - os: ubuntu-20.04
-            python-version: 3.6
-          - os: ubuntu-20.04
-            python-version: 3.5
           - os: ubuntu-latest
             python-version: 2.7
           # - os: macos-latest
           #   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.11
+            python-version: 3.12
           - os: windows-latest
             python-version: 3.8
           - os: windows-latest
             python-version: 2.7
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v3
+        uses: LizardByte/setup-python-action@master
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install dependencies

CHANGES.rst

@@ -1,6 +1,11 @@
 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

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/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/plat_other.py

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

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = Send2Trash
-version = 1.8.2
+version = 1.8.3
 url = https://github.com/arsenetar/send2trash
 project_urls = 
     Bug Reports = https://github.com/arsenetar/send2trash/issues
@@ -20,19 +20,18 @@ 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 = 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=