diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-09-28 14:08:59 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-09-28 15:17:26 -0400 |
| commit | c3f102c9fe9811fd5286628cc6aafa5fbc324621 (patch) | |
| tree | 4a78723089ded623701667de1eee21d22edbe6c1 /lib/sqlalchemy/engine | |
| parent | 75ac0abc7d5653d10006769a881374a46b706db5 (diff) | |
| download | sqlalchemy-c3f102c9fe9811fd5286628cc6aafa5fbc324621.tar.gz | |
upgrade to black 20.8b1
It's better, the majority of these changes look more readable to me.
also found some docstrings that had formatting / quoting issues.
Change-Id: I582a45fde3a5648b2f36bab96bad56881321899b
Diffstat (limited to 'lib/sqlalchemy/engine')
| -rw-r--r-- | lib/sqlalchemy/engine/base.py | 18 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/cursor.py | 7 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/interfaces.py | 4 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/reflection.py | 3 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/result.py | 20 | ||||
| -rw-r--r-- | lib/sqlalchemy/engine/url.py | 6 |
6 files changed, 32 insertions, 26 deletions
diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index e6215540d..9a6bdd7f3 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -67,9 +67,7 @@ class Connection(Connectable): _dispatch=None, _has_events=None, ): - """Construct a new Connection. - - """ + """Construct a new Connection.""" self.engine = engine self.dialect = engine.dialect self.__branch_from = _branch_from @@ -347,7 +345,7 @@ class Connection(Connectable): return c def get_execution_options(self): - """ Get the non-SQL options which will take effect during execution. + """Get the non-SQL options which will take effect during execution. .. versionadded:: 1.3 @@ -1234,7 +1232,11 @@ class Connection(Connectable): for fn in self.dispatch.before_execute: elem, event_multiparams, event_params = fn( - self, elem, event_multiparams, event_params, execution_options, + self, + elem, + event_multiparams, + event_params, + execution_options, ) if event_multiparams: @@ -2124,9 +2126,7 @@ class Transaction(object): assert not self.is_active def rollback(self): - """Roll back this :class:`.Transaction`. - - """ + """Roll back this :class:`.Transaction`.""" try: self._do_rollback() finally: @@ -2618,7 +2618,7 @@ class Engine(Connectable, log.Identified): return self._option_cls(self, opt) def get_execution_options(self): - """ Get the non-SQL options which will take effect during execution. + """Get the non-SQL options which will take effect during execution. .. versionadded: 1.3 diff --git a/lib/sqlalchemy/engine/cursor.py b/lib/sqlalchemy/engine/cursor.py index 43afa3628..6c4a756c9 100644 --- a/lib/sqlalchemy/engine/cursor.py +++ b/lib/sqlalchemy/engine/cursor.py @@ -1034,7 +1034,8 @@ class BufferedRowCursorFetchStrategy(CursorFetchStrategy): @classmethod def create(cls, result): return BufferedRowCursorFetchStrategy( - result.cursor, result.context.execution_options, + result.cursor, + result.context.execution_options, ) def _buffer_rows(self, result, dbapi_cursor): @@ -1204,9 +1205,7 @@ _NO_RESULT_METADATA = _NoResultMetaData() class BaseCursorResult(object): - """Base class for database result objects. - - """ + """Base class for database result objects.""" out_parameters = None _metadata = None diff --git a/lib/sqlalchemy/engine/interfaces.py b/lib/sqlalchemy/engine/interfaces.py index e0e4a9a83..27de5aaaf 100644 --- a/lib/sqlalchemy/engine/interfaces.py +++ b/lib/sqlalchemy/engine/interfaces.py @@ -530,7 +530,7 @@ class Dialect(object): :param dbapi_connection: a DBAPI connection, typically proxied within a :class:`.ConnectionFairy`. - """ + """ raise NotImplementedError() @@ -541,7 +541,7 @@ class Dialect(object): :param dbapi_connection: a DBAPI connection, typically proxied within a :class:`.ConnectionFairy`. - """ + """ raise NotImplementedError() diff --git a/lib/sqlalchemy/engine/reflection.py b/lib/sqlalchemy/engine/reflection.py index 198b5e568..812f7ceec 100644 --- a/lib/sqlalchemy/engine/reflection.py +++ b/lib/sqlalchemy/engine/reflection.py @@ -230,8 +230,7 @@ class Inspector(object): return self.dialect.default_schema_name def get_schema_names(self): - """Return all schema names. - """ + """Return all schema names.""" if hasattr(self.dialect, "get_schema_names"): with self._operation_context() as conn: diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py index 56abca9a9..8b9b413c4 100644 --- a/lib/sqlalchemy/engine/result.py +++ b/lib/sqlalchemy/engine/result.py @@ -167,7 +167,10 @@ class SimpleResultMetaData(ResultMetaData): if extra: recs_names = [ - ((name,) + extras, (index, name, extras),) + ( + (name,) + extras, + (index, name, extras), + ) for index, (name, extras) in enumerate(zip(self._keys, extra)) ] else: @@ -407,7 +410,10 @@ class ResultInternal(InPlaceGenerative): rows = [ made_row for made_row, sig_row in [ - (made_row, strategy(made_row) if strategy else made_row,) + ( + made_row, + strategy(made_row) if strategy else made_row, + ) for made_row in made_rows ] if sig_row not in uniques and not uniques.add(sig_row) @@ -543,7 +549,10 @@ class ResultInternal(InPlaceGenerative): return manyrows def _only_one_row( - self, raise_for_second_row, raise_for_none, scalar, + self, + raise_for_second_row, + raise_for_none, + scalar, ): onerow = self._fetchone_impl @@ -1400,10 +1409,7 @@ class MappingResult(FilterResult): def columns(self, *col_expressions): # type: (*object) -> MappingResult - r"""Establish the columns that should be returned in each row. - - - """ + r"""Establish the columns that should be returned in each row.""" return self._column_slices(col_expressions) def partitions(self, size=None): diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py index 6d2f4aa24..58f59642c 100644 --- a/lib/sqlalchemy/engine/url.py +++ b/lib/sqlalchemy/engine/url.py @@ -140,7 +140,7 @@ class URL( :class:`_engine.URL`, use the :meth:`_engine.URL.set` and :meth:`_engine.URL.update_query` methods. - """ + """ return cls( cls._assert_str(drivername, "drivername"), @@ -205,7 +205,9 @@ class URL( return util.immutabledict( { - _assert_str(key): _assert_value(value,) + _assert_str(key): _assert_value( + value, + ) for key, value in dict_items } ) |
