From 9ad811432ab0ca3292410d29464ce2532361eb55 Mon Sep 17 00:00:00 2001
From: JackDandy <JackDandy@users.noreply.github.com>
Date: Sun, 9 Nov 2014 20:23:13 +0000
Subject: [PATCH] Fix invalid use of str() in the Send2Trash library for
platforms other.
---
CHANGES.md | 1 +
lib/send2trash/plat_other.py | 4 +++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/CHANGES.md b/CHANGES.md
index 836bdb30..4cde3267 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -66,6 +66,7 @@
* Fix display issue of season tables in displayShow view / Display Specials
* Change to suppress reporting of Tornado exception error 1
* Fix progress sort direction for poster layout view on home page
+* Fix invalid use of str() in the Send2Trash library for platforms other
### 0.2.1 (2014-10-22 06:41:00 UTC)
diff --git a/lib/send2trash/plat_other.py b/lib/send2trash/plat_other.py
index 59000eca..402831d8 100644
--- a/lib/send2trash/plat_other.py
+++ b/lib/send2trash/plat_other.py
@@ -133,7 +133,9 @@ def get_dev(path):
def send2trash(path):
if not isinstance(path, str):
- path = str(path, sys.getfilesystemencoding())
+ # path = str(path, sys.getfilesystemencoding()) # removed invalid arg passed to str function, shouldn't be used anyway
+ path = str(path)
+
if not op.exists(path):
raise OSError("File not found: %s" % path)
# ...should check whether the user has the necessary permissions to delete
--
GitLab