diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-06-17 11:27:07 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2016-06-17 11:27:07 -0400 |
| commit | bb74ce0a2d13948b58d9aa5159c7a872fce07ad3 (patch) | |
| tree | 51e2a017b92ff4fc48e32c4c2ddc9e867f501259 | |
| parent | d59cf4eb3f98f4a309693d2d3e128ea142e197a6 (diff) | |
| download | sqlalchemy-pypy_run.tar.gz | |
Get pypy to runpypy_run
Change-Id: Idf8d66c5d65ca7cadf1d04d04441c957f5dc8f51
| -rw-r--r-- | lib/sqlalchemy/engine/result.py | 6 | ||||
| -rw-r--r-- | tox.ini | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py index 7fe09b2c7..2801ca559 100644 --- a/lib/sqlalchemy/engine/result.py +++ b/lib/sqlalchemy/engine/result.py @@ -650,7 +650,11 @@ class ResultProxy(object): self.connection = context.root_connection self._echo = self.connection._echo and \ context.engine._should_log_debug() - self._init_metadata() + try: + self._init_metadata() + except: + self._soft_close() + raise def _getter(self, key, raiseerr=True): try: @@ -1,6 +1,6 @@ [tox] -envlist = py{26,27,34,35}-{cext,nocext} +envlist = py{26,27,34,35}-{cext,nocext}, pypy-nocext [testenv] # note that we have a .coveragerc file that points coverage specifically @@ -17,6 +17,7 @@ deps=pytest pytest-xdist mock postgresql: psycopg2 + pypy-postgresql: psycopg2cffi mysql: mysqlclient mysql: pymysql oracle: cx_oracle @@ -51,6 +52,7 @@ setenv= cov: COVERAGE={[testenv]cov_args} sqlite: SQLITE=--db sqlite postgresql: POSTGRESQL=--db postgresql + pypy-postgresql: POSTGRESQL=--db postgresql_psycopg2cffi mysql: MYSQL=--db mysql --db pymysql oracle: ORACLE=--db oracle --low-connections --write-idents oracle_idents.txt mssql: MSSQL=--db pyodbc --db pymssql |