Merge pull request #1223 from radarhere/olefileio

Removed pre-Python 2.3 workaround from OleFileIO
This commit is contained in:
Hugo 2015-05-10 10:45:34 +03:00
commit 8f0dca2333

View File

@ -267,16 +267,9 @@ else:
#[PL] These workarounds were inspired from the Path module #[PL] These workarounds were inspired from the Path module
# (see http://www.jorendorff.com/articles/python/path/) # (see http://www.jorendorff.com/articles/python/path/)
#TODO: test with old Python versions
# Pre-2.3 workaround for basestring.
try: try:
basestring basestring
except NameError: 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 #[PL] Experimental setting: if True, OLE filenames will be kept in Unicode