From b213f63c591df7e6512b0b92b54c589a2a0141a9 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Sun, 10 May 2015 22:36:23 +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 d787e59ed..df95e2d83 100755 --- a/PIL/OleFileIO.py +++ b/PIL/OleFileIO.py @@ -302,17 +302,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.