Private GIT

Skip to content
Snippets Groups Projects
Commit 5cd1b65b authored by JackDandy's avatar JackDandy
Browse files

Merge pull request #131 from JackDandy/FixTrashOnPlatformOther

Fix invalid use of str() in the Send2Trash library for platforms other.
parents 80012e83 9ad81143
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment