dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #758 from niphlod/fix/safer_adapters_import

Browse Source 
we should always avoid importing "optionals" without a try:except.
This commit is contained in:
mdipierro
2015-02-05 17:57:45 -06:00
parent 5da5d510a0 7e07ff8b39
commit 0c1c36e022
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/dal.py
+10 -4
View File
@@ -126,11 +126,17 @@ class DAL(pyDAL):
#: add web2py contrib drivers to pyDAL #: add web2py contrib drivers to pyDAL
from pydal.drivers import DRIVERS from pydal.drivers import DRIVERS
if not DRIVERS.get('pymysql'): if not DRIVERS.get('pymysql'):
from .contrib import pymysql try:
DRIVERS['pymysql'] = pymysql from .contrib import pymysql
DRIVERS['pymysql'] = pymysql
except:
pass
#if not DRIVERS.get('pg8000'): #if not DRIVERS.get('pg8000'):
# from .contrib import pg8000 # from .contrib import pg8000
# DRIVERS['pg8000'] = pg8000 # DRIVERS['pg8000'] = pg8000
if not DRIVERS.get('pyodbc'): if not DRIVERS.get('pyodbc'):
from .contrib import pypyodbc as pyodbc try:
DRIVERS['pyodbc'] = pyodbc from .contrib import pypyodbc as pyodbc
DRIVERS['pyodbc'] = pyodbc
except:
pass