mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-01-13 10:46:16 +03:00
Merge pull request #1223 from radarhere/olefileio
Removed pre-Python 2.3 workaround from OleFileIO
This commit is contained in:
commit
8f0dca2333
|
@ -267,17 +267,10 @@ 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:
|
basestring = str
|
||||||
# is Unicode supported (Python >2.0 or >1.6 ?)
|
|
||||||
basestring = (str, unicode)
|
|
||||||
except NameError:
|
|
||||||
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
|
||||||
# if False (default PIL behaviour), all filenames are converted to Latin-1.
|
# if False (default PIL behaviour), all filenames are converted to Latin-1.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user