Merge pull request #79 from mnaberez/explain-typeerror-from-use-errno

Add comment to explain why use_errno may cause TypeError
labjack · Jan 19, 2015 · 815e6d1 · 815e6d1
2 parents 31cc3b3 + 5c44364
commit 815e6d1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/LabJackPython.py b/src/LabJackPython.py
@@ -89,7 +89,7 @@ def _loadLinuxSo():
     """
     try:
         l = ctypes.CDLL("liblabjackusb.so", use_errno=True)
-    except TypeError:
+    except TypeError: # Python 2.5
         l = ctypes.CDLL("liblabjackusb.so")
     l.LJUSB_Stream.errcheck = errcheck
     l.LJUSB_Read.errcheck = errcheck
@@ -101,7 +101,7 @@ def _loadMacDylib():
     """
     try:
         l = ctypes.CDLL("liblabjackusb.dylib", use_errno=True)
-    except TypeError:
+    except TypeError: # Python 2.5
         l = ctypes.CDLL("liblabjackusb.dylib")
     l.LJUSB_Stream.errcheck = errcheck
     l.LJUSB_Read.errcheck = errcheck

diff --git a/src/u12.py b/src/u12.py
@@ -346,7 +346,7 @@ def errcheck(ret, func, args):
 def _loadLinuxSo():
     try:
         l = ctypes.CDLL("liblabjackusb.so", use_errno=True)
-    except TypeError:
+    except TypeError: # Python 2.5
         l = ctypes.CDLL("liblabjackusb.so")
     l.LJUSB_Stream.errcheck = errcheck
     l.LJUSB_Read.errcheck = errcheck
@@ -355,7 +355,7 @@ def _loadLinuxSo():
 def _loadMacDylib():
     try:
         l = ctypes.CDLL("liblabjackusb.dylib", use_errno=True)
-    except TypeError:
+    except TypeError: # Python 2.5
         l = ctypes.CDLL("liblabjackusb.dylib")
     l.LJUSB_Stream.errcheck = errcheck
     l.LJUSB_Read.errcheck = errcheck