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

Merge pull request #1483 from niphlod/fix/pymysql_local_imports

Browse Source 
make pymysql usable inside web2py
This commit is contained in:
mdipierro authored and GitHub committed 2016-10-03 14:48:30 -05:00
2 parents d602631c7e 9256d67ec7
commit 99c3e06589
3 files changed
+3 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.travis.yml
+1 -1
View File
@@ -25,7 +25,7 @@ install:
virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION" virtualenv --python="$PYENV_ROOT/versions/pypy-$PYPY_VERSION/bin/python" "$HOME/virtualenvs/pypy-$PYPY_VERSION"
source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate" source "$HOME/virtualenvs/pypy-$PYPY_VERSION/bin/activate"
fi fi
- if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then pip install pycrypto pg8000 pymysql; fi; - if [[ $TRAVIS_PYTHON_VERSION == '3.5' ]]; then pip install pycrypto pg8000; fi;
- if [[ $TRAVIS_PYTHON_VERSION != '3.5' ]]; then pip install -e .; fi; - if [[ $TRAVIS_PYTHON_VERSION != '3.5' ]]; then pip install -e .; fi;
before_script: before_script:
CHANGELOG
+1
View File
@@ -10,6 +10,7 @@
"from gluon.storage import Storage" "from gluon.storage import Storage"
- tests can only be run with the usual web2py.py --run_system_tests OR with - tests can only be run with the usual web2py.py --run_system_tests OR with
python -m unittest -v gluon.tests on the root dir python -m unittest -v gluon.tests on the root dir
- updated pymysql driver
## 2.14.6 ## 2.14.6
gluon/contrib/pymysql/__init__.py
+1 -1
View File
@@ -89,7 +89,7 @@ def Connect(*args, **kwargs):
from .connections import Connection from .connections import Connection
return Connection(*args, **kwargs) return Connection(*args, **kwargs)
from pymysql import connections as _orig_conn from . import connections as _orig_conn
if _orig_conn.Connection.__init__.__doc__ is not None: if _orig_conn.Connection.__init__.__doc__ is not None:
Connect.__doc__ = _orig_conn.Connection.__init__.__doc__ Connect.__doc__ = _orig_conn.Connection.__init__.__doc__
del _orig_conn del _orig_conn