Merge pull request #758 from niphlod/fix/safer_adapters_import

we should always avoid importing "optionals" without a try:except.
2015-02-05 17:57:45 -06:00
parent 5da5d510a0 7e07ff8b39
commit 0c1c36e022
1 changed files with 10 additions and 4 deletions
@@ -126,11 +126,17 @@ class DAL(pyDAL):
 #: add web2py contrib drivers to pyDAL
 from pydal.drivers import DRIVERS
 if not DRIVERS.get('pymysql'):
-    from .contrib import pymysql
-    DRIVERS['pymysql'] = pymysql
+    try:
+        from .contrib import pymysql
+        DRIVERS['pymysql'] = pymysql
+    except:
+        pass
 #if not DRIVERS.get('pg8000'):
 #    from .contrib import pg8000
 #    DRIVERS['pg8000'] = pg8000
 if not DRIVERS.get('pyodbc'):
-    from .contrib import pypyodbc as pyodbc
-    DRIVERS['pyodbc'] = pyodbc
+    try:
+        from .contrib import pypyodbc as pyodbc
+        DRIVERS['pyodbc'] = pyodbc
+    except:
+        pass