Mercurial Repositories > eric / changeset

• changeset
• raw

changeset

Fixed an issue in a third party package causing a stacktrace on Python2 in a call to str(). 6_0_x

Mon, 04 May 2015 19:42:53 +0200

author

Detlev Offenbach <detlev@die-offenbachs.de>

date

Mon, 04 May 2015 19:42:53 +0200

branch

6_0_x

changeset 4248

5a413ab0f6a3

parent 4246

1ad4be314c53

child 4251

5bc24c67385a

Fixed an issue in a third party package causing a stacktrace on Python2 in a call to str().
(grafted from c5d6a59a8cdde88327db1a8f817aac645067a629)

--- a/ThirdParty/Send2Trash/send2trash/plat_other.py	Fri May 01 11:38:19 2015 +0200
+++ b/ThirdParty/Send2Trash/send2trash/plat_other.py	Mon May 04 19:42:53 2015 +0200
@@ -15,6 +15,10 @@
 # find or create the user's trash directory.
 
 from __future__ import unicode_literals
+try:
+    str = unicode
+except NameError:
+    pass
 
 import sys
 import os