From dbd3415709e43b77430e1ba34e17e6de4830a905 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 8 May 2015 16:37:52 +1000 Subject: [PATCH] Removed pre-Python 2.3 workaround --- PIL/OleFileIO.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/PIL/OleFileIO.py b/PIL/OleFileIO.py index 88b68fa4a..c804dd454 100755 --- a/PIL/OleFileIO.py +++ b/PIL/OleFileIO.py @@ -267,17 +267,10 @@ else: #[PL] These workarounds were inspired from the Path module # (see http://www.jorendorff.com/articles/python/path/) -#TODO: test with old Python versions - -# Pre-2.3 workaround for basestring. try: basestring except NameError: - try: - # is Unicode supported (Python >2.0 or >1.6 ?) - basestring = (str, unicode) - except NameError: - basestring = str + basestring = str #[PL] Experimental setting: if True, OLE filenames will be kept in Unicode # if False (default PIL behaviour), all filenames are converted to Latin-1.