From 0f3d247a8716d41c3fa57dfa19347bcec7acd9b6 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 8 Dec 2015 21:59:05 +1100 Subject: [PATCH] Removed pre-Python 2.3 workaround from OleFileIO --- PIL/OleFileIO.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/PIL/OleFileIO.py b/PIL/OleFileIO.py index 33b193e71..b603e6af3 100755 --- a/PIL/OleFileIO.py +++ b/PIL/OleFileIO.py @@ -314,17 +314,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.