README.rst

@@ -22,14 +22,10 @@ issues and fixes would be most appreciated.
 Installation
 ------------
 
-You can download it with pip:
+You can download it with pip::
 
     python -m pip install -U send2trash
 
-To install with pywin32 or pyobjc required specify the extra `nativeLib`:
-
-    python -m pip install -U send2trash[nativeLib]
-
 or you can download the source from http://github.com/arsenetar/send2trash and install it with::
 
     >>> python setup.py install

send2trash/plat_gio.py

@@ -6,11 +6,11 @@
 
 from gi.repository import GObject, Gio
 from .exceptions import TrashPermissionError
-from .util import preprocess_paths
 
 
 def send2trash(paths):
-    paths = preprocess_paths(paths)
+    if not isinstance(paths, list):
+        paths = [paths]
     for path in paths:
         try:
             f = Gio.File.new_for_path(path)

send2trash/plat_osx_ctypes.py

@@ -10,7 +10,6 @@ from ctypes import cdll, byref, Structure, c_char, c_char_p
 from ctypes.util import find_library
 
 from .compat import binary_type
-from .util import preprocess_paths
 
 Foundation = cdll.LoadLibrary(find_library("Foundation"))
 CoreServices = cdll.LoadLibrary(find_library("CoreServices"))
@@ -41,7 +40,8 @@ def check_op_result(op_result):
 
 
 def send2trash(paths):
-    paths = preprocess_paths(paths)
+    if not isinstance(paths, list):
+        paths = [paths]
     paths = [
         path.encode("utf-8") if not isinstance(path, binary_type) else path
         for path in paths

send2trash/plat_osx_pyobjc.py

@@ -6,7 +6,6 @@
 
 from Foundation import NSFileManager, NSURL
 from .compat import text_type
-from .util import preprocess_paths
 
 
 def check_op_result(op_result):
@@ -17,7 +16,8 @@ def check_op_result(op_result):
 
 
 def send2trash(paths):
-    paths = preprocess_paths(paths)
+    if not isinstance(paths, list):
+        paths = [paths]
     paths = [
         path.decode("utf-8") if not isinstance(path, text_type) else path
         for path in paths

send2trash/plat_other.py

@@ -30,7 +30,6 @@ except ImportError:
     from urllib import quote
 
 from .compat import text_type, environb
-from .util import preprocess_paths
 from .exceptions import TrashPermissionError
 
 try:
@@ -173,7 +172,8 @@ def get_dev(path):
 
 
 def send2trash(paths):
-    paths = preprocess_paths(paths)
+    if not isinstance(paths, list):
+        paths = [paths]
     for path in paths:
         if isinstance(path, text_type):
             path_b = fsencode(path)

send2trash/plat_win_legacy.py

@@ -7,8 +7,6 @@
 from __future__ import unicode_literals
 import os.path as op
 from .compat import text_type
-from .util import preprocess_paths
-
 from ctypes import (
     windll,
     Structure,
@@ -103,7 +101,8 @@ def get_short_path_name(long_name):
 
 
 def send2trash(paths):
-    paths = preprocess_paths(paths)
+    if not isinstance(paths, list):
+        paths = [paths]
     # convert data type
     paths = [
         text_type(path, "mbcs") if not isinstance(path, text_type) else path

send2trash/plat_win_modern.py

@@ -7,7 +7,6 @@
 from __future__ import unicode_literals
 import os.path as op
 from .compat import text_type
-from .util import preprocess_paths
 from platform import version
 import pythoncom
 import pywintypes
@@ -16,7 +15,8 @@ from .IFileOperationProgressSink import CreateSink
 
 
 def send2trash(paths):
-    paths = preprocess_paths(paths)
+    if not isinstance(paths, list):
+        paths = [paths]
     # convert data type
     paths = [
         text_type(path, "mbcs") if not isinstance(path, text_type) else path
@@ -26,8 +26,6 @@ def send2trash(paths):
     paths = [op.abspath(path) if not op.isabs(path) else path for path in paths]
     # remove the leading \\?\ if present
     paths = [path[4:] if path.startswith("\\\\?\\") else path for path in paths]
-    # Need to initialize the com before using
-    pythoncom.CoInitialize()
     # create instance of file operation object
     fileop = pythoncom.CoCreateInstance(
         shell.CLSID_FileOperation, None, pythoncom.CLSCTX_ALL, shell.IID_IFileOperation,
@@ -67,6 +65,3 @@ def send2trash(paths):
         # convert to standard OS error, allows other code to get a
         # normal errno
         raise OSError(None, error.strerror, path, error.hresult)
-    finally:
-        # Need to make sure we call this once fore every init
-        pythoncom.CoUninitialize()

send2trash/util.py

@@ -1,16 +0,0 @@
-# encoding: utf-8
-# Copyright 2017 Virgil Dupras
-
-# This software is licensed under the "BSD" License as described in the "LICENSE" file,
-# which should be included with this package. The terms are also available at
-# http://www.hardcoded.net/licenses/bsd_license
-
-
-def preprocess_paths(paths):
-    if 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
-    ]
-    return paths

setup.py

@@ -35,14 +35,7 @@ setup(
     description="Send file to trash natively under Mac OS X, Windows and Linux.",
     long_description=LONG_DESCRIPTION,
     classifiers=CLASSIFIERS,
-    extras_require={
-        "win32": ['pywin32; sys_platform == "win32"'],
-        "objc": ['pyobjc-framework-Cocoa; sys_platform == "darwin"'],
-        "nativeLib": [
-            'pywin32; sys_platform == "win32"',
-            'pyobjc-framework-Cocoa; sys_platform == "darwin"',
-        ],
-    },
+    extras_require={"win32": ["pywin32"], "objc": ["pyobjc-framework-Cocoa"]},
     project_urls={"Bug Reports": "https://github.com/arsenetar/send2trash/issues"},
     entry_points={"console_scripts": ["send2trash=send2trash.__main__:main"]},
 )