From 5a6a475e14f09a36061b7422534b073e1041fe44 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 9 Feb 2022 15:39:44 -0500 Subject: update zimports includes new fix for formatting like black does. also runs black on a few outliers. Change-Id: I67446660a6bc10b73eb710389ae6d3f122af9302 --- lib/sqlalchemy/sql/__init__.py | 17 +++++++---------- lib/sqlalchemy/sql/expression.py | 15 ++++++--------- 2 files changed, 13 insertions(+), 19 deletions(-) (limited to 'lib/sqlalchemy/sql') diff --git a/lib/sqlalchemy/sql/__init__.py b/lib/sqlalchemy/sql/__init__.py index b558f9bf5..2f84370aa 100644 --- a/lib/sqlalchemy/sql/__init__.py +++ b/lib/sqlalchemy/sql/__init__.py @@ -48,6 +48,13 @@ from .expression import Join as Join from .expression import join as join from .expression import label as label from .expression import LABEL_STYLE_DEFAULT as LABEL_STYLE_DEFAULT +from .expression import ( + LABEL_STYLE_DISAMBIGUATE_ONLY as LABEL_STYLE_DISAMBIGUATE_ONLY, +) +from .expression import LABEL_STYLE_NONE as LABEL_STYLE_NONE +from .expression import ( + LABEL_STYLE_TABLENAME_PLUS_COL as LABEL_STYLE_TABLENAME_PLUS_COL, +) from .expression import lambda_stmt as lambda_stmt from .expression import LambdaElement as LambdaElement from .expression import lateral as lateral @@ -88,16 +95,6 @@ from .expression import values as values from .expression import within_group as within_group from .visitors import ClauseVisitor as ClauseVisitor -if True: - # work around zimports bug - from .expression import ( - LABEL_STYLE_DISAMBIGUATE_ONLY as LABEL_STYLE_DISAMBIGUATE_ONLY, - ) - from .expression import LABEL_STYLE_NONE as LABEL_STYLE_NONE - from .expression import ( - LABEL_STYLE_TABLENAME_PLUS_COL as LABEL_STYLE_TABLENAME_PLUS_COL, - ) - def __go(lcls): from .. import util as _sa_util diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 680eae754..0ed5bd986 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -123,7 +123,13 @@ from .selectable import HasPrefixes as HasPrefixes from .selectable import HasSuffixes as HasSuffixes from .selectable import Join as Join from .selectable import LABEL_STYLE_DEFAULT as LABEL_STYLE_DEFAULT +from .selectable import ( + LABEL_STYLE_DISAMBIGUATE_ONLY as LABEL_STYLE_DISAMBIGUATE_ONLY, +) from .selectable import LABEL_STYLE_NONE as LABEL_STYLE_NONE +from .selectable import ( + LABEL_STYLE_TABLENAME_PLUS_COL as LABEL_STYLE_TABLENAME_PLUS_COL, +) from .selectable import Lateral as Lateral from .selectable import ReturnsRows as ReturnsRows from .selectable import ScalarSelect as ScalarSelect @@ -139,14 +145,5 @@ from .selectable import TextualSelect as TextualSelect from .selectable import Values as Values from .visitors import Visitable as Visitable -if True: - # work around zimports - from .selectable import ( - LABEL_STYLE_DISAMBIGUATE_ONLY as LABEL_STYLE_DISAMBIGUATE_ONLY, - ) - from .selectable import ( - LABEL_STYLE_TABLENAME_PLUS_COL as LABEL_STYLE_TABLENAME_PLUS_COL, - ) - nullsfirst = nulls_first nullslast = nulls_last -- cgit v1.2.1