Merge branch 'feature/UpdateSend2trash' into dev

This commit is contained in:
JackDandy 2023-05-08 21:11:08 +01:00
commit d335de1bbb
2 changed files with 2 additions and 4 deletions

View file

@ -10,6 +10,7 @@
* Update Msgpack 1.0.4 (b5acfd5) to 1.0.5 (0516c2c)
* Update Pytvmaze library 2.0.8 (16ed096) to 2.0.8 (81888a5)
* Update Requests library 2.28.1 (ec553c2) to 2.29.0 (87d63de)
* Update Send2Trash 1.8.1b0 (0ef9b32) to 1.8.2 (0244f53)
* Update SimpleJSON 3.18.1 (c891b95) to 3.19.1 (aeb63ee)
* Update Tornado Web Server 6.3.0 (7186b86) to 6.3.1 (419838b)
* Update urllib3 1.26.14 (a06c05c) to 1.26.15 (25cca389)

View file

@ -86,10 +86,7 @@ def convert_sh_file_opt_result(result):
0x10074: 0x57, # DE_ROOTDIR | ERRORONDEST -> ERROR_INVALID_PARAMETER
}
if result in results.keys():
return results[result]
else:
return result
return results.get(result, result)
def prefix_and_path(path):