send2trash/plat_win_legacy.py

@@ -77,6 +77,8 @@ def send2trash(paths):
     paths = [op.abspath(path) if not op.isabs(path) else path for path in paths]
     # get short path to handle path length issues
     paths = [get_short_path_name(path) for path in paths]
+    # convert to a single string of null terminated paths
+    paths = "\0".join(paths)
     fileop = SHFILEOPSTRUCTW()
     fileop.hwnd = 0
     fileop.wFunc = FO_DELETE
@@ -91,15 +93,7 @@ def send2trash(paths):
     # NOTE: based on how python allocates memory for these types they should
     # always be zero, if this is ever not true we can go back to explicitly
     # setting the last two characters to null using buffer[index] = '\0'.
-    # Additional note on another issue here, unicode_buffer expects length in
+    buffer = create_unicode_buffer(paths, len(paths) + 2)
-    # bytes essentially, so having multi-byte characters causes issues if just
-    # passing pythons string length.  Instead of dealing with this difference we
-    # just create a buffer then a new one with an extra null.  Since the non-length
-    # specified version apparently stops after the first null, join with a space first.
-    buffer = create_unicode_buffer(" ".join(paths))
-    # convert to a single string of null terminated paths
-    path_string = "\0".join(paths)
-    buffer = create_unicode_buffer(path_string, len(buffer) + 1)
     fileop.pFrom = LPCWSTR(addressof(buffer))
     fileop.pTo = None
     fileop.fFlags = FOF_ALLOWUNDO | FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT

tests/test_plat_other.py

@@ -32,7 +32,6 @@ def testfile():
         dir=op.expanduser("~"), prefix="send2trash_test", delete=False
     )
     file.close()
-    assert op.exists(file.name) is True
     yield file
     # Cleanup trash files on supported platforms
     if sys.platform != "win32":
@@ -58,7 +57,6 @@ def testfiles():
         )
     )
     [file.close() for file in files]
-    assert all([op.exists(file.name) for file in files]) is True
     yield files
     filenames = [op.basename(file.name) for file in files]
     [os.remove(op.join(HOMETRASH, "files", filename)) for filename in filenames]
@@ -95,7 +93,6 @@ def testUnicodefile():
     name = u"send2trash_tést1"
     file = op.join(op.expanduser(b"~"), name.encode("utf-8"))
     touch(file)
-    assert op.exists(file) is True
     yield file
     # Cleanup trash files on supported platforms
     if sys.platform != "win32":
@@ -161,7 +158,6 @@ def testExtVol():
     fileName = "test.txt"
     filePath = op.join(volume.trashTopdir, fileName)
     touch(filePath)
-    assert op.exists(filePath) is True
     yield volume, fileName, filePath
     volume.cleanup()
 

tests/test_plat_win.py

@@ -26,7 +26,6 @@ def _create_tree(path):
 @pytest.fixture
 def testdir(tmp_path):
     dirname = "\\\\?\\" + str(tmp_path)
-    assert op.exists(dirname) is True
     yield dirname
     shutil.rmtree(dirname, ignore_errors=True)
 
@@ -35,7 +34,6 @@ def testdir(tmp_path):
 def testfile(testdir):
     file = op.join(testdir, "testfile.txt")
     _create_tree(file)
-    assert op.exists(file) is True
     yield file
     # Note dir will cleanup the file
 
@@ -44,7 +42,6 @@ def testfile(testdir):
 def testfiles(testdir):
     files = [op.join(testdir, "testfile{}.txt".format(index)) for index in range(10)]
     [_create_tree(file) for file in files]
-    assert all([op.exists(file) for file in files]) is True
     yield files
     # Note dir will cleanup the files
 
@@ -69,19 +66,6 @@ def _file_not_found(dir, fcn):
     pytest.raises(OSError, fcn, file)
 
 
-def _multi_byte_unicode(dir, fcn):
-    single_file = op.join(dir, "😇.txt")
-    _create_tree(single_file)
-    assert op.exists(single_file) is True
-    fcn(single_file)
-    assert op.exists(single_file) is False
-    files = [op.join(dir, "😇{}.txt".format(index)) for index in range(10)]
-    [_create_tree(file) for file in files]
-    assert all([op.exists(file) for file in files]) is True
-    fcn(files)
-    assert any([op.exists(file) for file in files]) is False
-
-
 def test_trash_folder(testdir):
     _trash_folder(testdir, s2t)
 
@@ -114,10 +98,6 @@ def test_file_not_found_modern(testdir):
     _file_not_found(testdir, s2t_modern)
 
 
-def test_multi_byte_unicode_modern(testdir):
-    _multi_byte_unicode(testdir, s2t_modern)
-
-
 def test_trash_folder_legacy(testdir):
     _trash_folder(testdir, s2t_legacy)
 
@@ -134,10 +114,6 @@ def test_file_not_found_legacy(testdir):
     _file_not_found(testdir, s2t_legacy)
 
 
-def test_multi_byte_unicode_legacy(testdir):
-    _multi_byte_unicode(testdir, s2t_legacy)
-
-
 # Long path tests
 @pytest.fixture
 def longdir(tmp_path):
@@ -153,7 +129,6 @@ def longfile(longdir):
     path = op.join(longdir, name + "{}.txt")
     file = path.format("")
     _create_tree(file)
-    assert op.exists(file) is True
     yield file
 
 
@@ -163,14 +138,11 @@ def longfiles(longdir):
     path = op.join(longdir, name + "{}.txt")
     files = [path.format(index) for index in range(10)]
     [_create_tree(file) for file in files]
-    assert all([op.exists(file) for file in files]) is True
     yield files
 
 
-# NOTE: both legacy and modern test "pass" on windows, however sometimes with the same path
+# NOTE: both legacy and modern test "pass" on windows, but actually are not moving files to the
-# they do not actually recycle files but delete them.  Noticed this when testing with the
+# recycle bin, this was tested on latest windows 10, thought to have worked previously
-# recycle bin open, noticed later tests actually worked, modern version can actually detect
-# when this happens but not stop it at this moment, and we need a way to verify it when testing.
 def test_trash_long_file_modern(longfile):
     _trash_file(longfile, s2t_modern)
 

tests/test_script_main.py

@@ -18,8 +18,6 @@ def file():
         dir=op.expanduser("~"), prefix="send2trash_test", delete=False
     )
     file.close()
-    # Verify file was actually created
-    assert op.exists(file.name) is True
     yield file.name
     # Cleanup trash files on supported platforms
     if sys.platform != "win32":