From 02dc392c452c45c9194004a5f72dc5411c1a52a7 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Fri, 9 Jul 2010 21:49:46 -0700
Subject: [PATCH] Fixed a bug in plat_other where conflict handling wouldn't be
 done correctly in external volume. Thanks to John Benediktsson for the tip.

--HG--
branch : py3k
extra : transplant_source : %C6%11%009sx%B29%CF%EC%CC%D4%88r%BE%D8%BB%9AIa
---
 send2trash/plat_other.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/send2trash/plat_other.py b/send2trash/plat_other.py
index 657d4a3..9ca7cc7 100644
--- a/send2trash/plat_other.py
+++ b/send2trash/plat_other.py
@@ -57,7 +57,7 @@ def move_without_conflict(src, dst):
         counter += 1
         base_name, ext = op.splitext(filename)
         new_filename = '{0} {1}{2}'.format(base_name, counter, ext)
-        destpath = op.join(TRASH_PATH, new_filename)
+        destpath = op.join(dst, new_filename)
     os.rename(src, destpath)
 
 def send2trash(path):