Merge branch 'issue138'

CHANGES.txt

@@ -1,3 +1,5 @@
+Oct 29, 2013 - v0.5.9  Fixed bad library load on linux as a result of 0.5.8
+
 Oct 29, 2013 - v0.5.8  Fixed unnecessary warnings when default locations for
     openjpeg libraries on mac do not specify the actual library.
 

docs/source/conf.py

@@ -78,7 +78,7 @@ copyright = u'2013, John Evans'
 # The short X.Y version.
 version = '0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.8'
+release = '0.5.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

glymur/lib/config.py

@@ -59,6 +59,7 @@ def load_openjpeg(path):
     # If we could not find it, then look in some likely locations on mac
     # and win.
     if path is None:
+        # Could not find a library via ctypes
         if platform.system() == 'Darwin':
             # MacPorts
             path = '/opt/local/lib/libopenjpeg.dylib'
@@ -66,6 +67,10 @@ def load_openjpeg(path):
             path = os.path.join('C:\\', 'Program files', 'OpenJPEG 1.5',
                                 'bin', 'openjpeg.dll')
 
+        if path is not None and not os.path.exists(path):
+            # the mac/win default location does not exist.
+            return None
+
     return load_library_handle(path)
 
 
@@ -73,10 +78,11 @@ def load_openjp2(path):
     """Load the openjp2 library, falling back on defaults if necessary.
     """
     if path is None:
-        # No help from the config file, try to find it ourselves.
+        # No help from the config file, try to find it via ctypes.
         path = find_library('openjp2')
 
     if path is None:
+        # Could not find a library via ctypes
         if platform.system() == 'Darwin':
             # MacPorts
             path = '/opt/local/lib/libopenjp2.dylib'
@@ -84,15 +90,20 @@ def load_openjp2(path):
             path = os.path.join('C:\\', 'Program files', 'OpenJPEG 2.0',
                                 'bin', 'openjp2.dll')
 
+        if path is not None and not os.path.exists(path):
+            # the mac/win default location does not exist.
+            return None
+
     return load_library_handle(path)
 
 
 def load_library_handle(path):
     """Load the library, return the ctypes handle."""
 
-    if path is None or (path is not None and not os.path.exists(path)):
+    if path is None:
         # Either could not find a library via ctypes or user-configuration-file,
         # or we could not find it in any of the default locations.
+        # This is probably a very old linux.
         return None
 
     try:

glymur/version.py

@@ -15,7 +15,7 @@ from .lib import openjp2 as opj2
 
 # Do not change the format of this next line!  Doing so risks breaking
 # setup.py
-version = "0.5.8"
+version = "0.5.9"
 _sv = LooseVersion(version)
 version_tuple = _sv.version