diff --git a/CHANGES.md b/CHANGES.md index 836bdb3031f1023fc4670e0bdaba2f5093be3088..4cde3267c02b98556f264f40f4970bab9b0a79c3 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 59000eca9b995b41fb749e86c8d6eb61619379cb..402831d8b71ba1901ead26368b15cd2bc1c1d951 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