diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-01-11 10:12:12 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-01-13 10:57:41 -0500 |
| commit | fa6dd376bb24845724287d980a98ea50eb1cfab1 (patch) | |
| tree | 91e536c76f4b76b8997b02f5cd5a41de29dc90ef /lib/sqlalchemy/engine/base.py | |
| parent | c703b9ce89483b6f44b97d1fbf56f8df8b14305a (diff) | |
| download | sqlalchemy-fa6dd376bb24845724287d980a98ea50eb1cfab1.tar.gz | |
Support python3.6
Corrects some warnings and adds tox config. Adds DeprecationWarning
to the error category. Large sweep for string literals w/ backslashes
as this is common in docstrings
Co-authored-by: Andrii Soldatenko
Fixes: #3886
Change-Id: Ia7c838dfbbe70b262622ed0803d581edc736e085
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/337
Diffstat (limited to 'lib/sqlalchemy/engine/base.py')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index 0c75eef5e..0334d2d7a 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -165,7 +165,7 @@ class Connection(Connectable): self.close() def execution_options(self, **opt): - """ Set non-SQL options for the connection which take effect + r""" Set non-SQL options for the connection which take effect during execution. The method returns a copy of this :class:`.Connection` which references @@ -175,7 +175,7 @@ class Connection(Connectable): underlying resource, it's usually a good idea to ensure that the copies will be discarded immediately, which is implicit if used as in:: - result = connection.execution_options(stream_results=True).\\ + result = connection.execution_options(stream_results=True).\ execute(stmt) Note that any key/value can be passed to @@ -877,7 +877,7 @@ class Connection(Connectable): return self.execute(object, *multiparams, **params).scalar() def execute(self, object, *multiparams, **params): - """Executes a SQL statement construct and returns a + r"""Executes a SQL statement construct and returns a :class:`.ResultProxy`. :param object: The statement to be executed. May be @@ -1459,7 +1459,7 @@ class Connection(Connectable): util.reraise(*exc_info) def transaction(self, callable_, *args, **kwargs): - """Execute the given function within a transaction boundary. + r"""Execute the given function within a transaction boundary. The function is passed this :class:`.Connection` as the first argument, followed by the given \*args and \**kwargs, @@ -1510,7 +1510,7 @@ class Connection(Connectable): trans.rollback() def run_callable(self, callable_, *args, **kwargs): - """Given a callable object or function, execute it, passing + r"""Given a callable object or function, execute it, passing a :class:`.Connection` as the first argument. The given \*args and \**kwargs are passed subsequent @@ -1769,7 +1769,7 @@ class Engine(Connectable, log.Identified): self.update_execution_options(**execution_options) def update_execution_options(self, **opt): - """Update the default execution_options dictionary + r"""Update the default execution_options dictionary of this :class:`.Engine`. The given keys/values in \**opt are added to the @@ -1978,7 +1978,7 @@ class Engine(Connectable, log.Identified): return Engine._trans_ctx(conn, trans, close_with_result) def transaction(self, callable_, *args, **kwargs): - """Execute the given function within a transaction boundary. + r"""Execute the given function within a transaction boundary. The function is passed a :class:`.Connection` newly procured from :meth:`.Engine.contextual_connect` as the first argument, @@ -2020,7 +2020,7 @@ class Engine(Connectable, log.Identified): return conn.transaction(callable_, *args, **kwargs) def run_callable(self, callable_, *args, **kwargs): - """Given a callable object or function, execute it, passing + r"""Given a callable object or function, execute it, passing a :class:`.Connection` as the first argument. The given \*args and \**kwargs are passed subsequent |
