From 1e278de4cc9a4181e0747640a960e80efcea1ca9 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sun, 6 Jan 2019 01:19:47 -0500 Subject: Post black reformatting Applied on top of a pure run of black -l 79 in I7eda77fed3d8e73df84b3651fd6cfcfe858d4dc9, this set of changes resolves all remaining flake8 conditions for those codes we have enabled in setup.cfg. Included are resolutions for all remaining flake8 issues including shadowed builtins, long lines, import order, unused imports, duplicate imports, and docstring issues. Change-Id: I4f72d3ba1380dd601610ff80b8fb06a2aff8b0fe --- lib/sqlalchemy/orm/properties.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'lib/sqlalchemy/orm/properties.py') diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py index a39cd8703..3ea68a913 100644 --- a/lib/sqlalchemy/orm/properties.py +++ b/lib/sqlalchemy/orm/properties.py @@ -13,12 +13,14 @@ mapped attributes. """ from __future__ import absolute_import -from .. import util, log -from ..sql import expression from . import attributes +from .interfaces import PropComparator +from .interfaces import StrategizedProperty from .util import _orm_full_deannotate +from .. import log +from .. import util +from ..sql import expression -from .interfaces import PropComparator, StrategizedProperty __all__ = ["ColumnProperty"] @@ -213,9 +215,9 @@ class ColumnProperty(StrategizedProperty): util.warn( ( "On mapper %s, primary key column '%s' is being combined " - "with distinct primary key column '%s' in attribute '%s'. " - "Use explicit properties to give each column its own mapped " - "attribute name." + "with distinct primary key column '%s' in attribute '%s'. " + "Use explicit properties to give each column its own " + "mapped attribute name." ) % (self.parent, self.columns[1], self.columns[0], self.key) ) -- cgit v1.2.1