jyapayne/glymur
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add additional path existance check to avoid unnecessary warning. #138

Browse source 
The warnings would come about if running on mac or windows where the
library could not be found via ctypes or the configuration file.
This commit is contained in:
John Evans 2013-10-29 09:17:32 -04:00
commit dd19340db2
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
glymur/lib/config.py
View file

@ -45,6 +45,12 @@ def glymurrc_fname():
def load_openjpeg(path): def load_openjpeg(path):
"""Load the openjpeg library, falling back on defaults if necessary. """Load the openjpeg library, falling back on defaults if necessary.
Parameters
----------
path : str
Path to openjpeg 1.5 library as specified by configuration file. Will
be None if no configuration file specified.
""" """
if path is None: if path is None:
# Let ctypes try to find it. # Let ctypes try to find it.
@ -84,7 +90,9 @@ def load_openjp2(path):
def load_library_handle(path): def load_library_handle(path):
"""Load the library, return the ctypes handle.""" """Load the library, return the ctypes handle."""
if path is None: if path is None or (path is not None and not os.path.exists(path)):
# Either could not find a library via ctypes or user-configuration-file,
# or we could not find it in any of the default locations.
return None return None
try: try:
@ -93,10 +101,10 @@ def load_library_handle(path):
else: else:
opj_lib = ctypes.CDLL(path) opj_lib = ctypes.CDLL(path)
except (TypeError, OSError): except (TypeError, OSError):
msg = '"Library {0}" could not be loaded. Operating in degraded mode.' msg = '"Library {0}" could not be loaded. Operating in degraded mode.'
msg = msg.format(path) msg = msg.format(path)
warnings.warn(msg, UserWarning) warnings.warn(msg, UserWarning)
opj_lib = None opj_lib = None
return opj_lib return opj_lib