Fix PEP8 errors

diff --git a/lib/sqlalchemy/ext/declarative/api.py b/lib/sqlalchemy/ext/declarative/api.py
index ccb6d9b069ab97d7ba3583eb3e7555b2ec1e4bb1..d1ce2e13055b0958750d6636d59be70e63150c50 100644 (file)
--- a/lib/sqlalchemy/ext/declarative/api.py
+++ b/lib/sqlalchemy/ext/declarative/api.py
@@ -445,7 +445,8 @@ class ConcreteBase(object):
         By default the name of the discriminator column used in the
         :func:`.polymorphic_union` will be ``type``. This name might clash with
         a column in one of your mapped tables. For that reason, the name of
-        the discriminator can be configured by setting the ``_concrete_discriminator_name`` attribute.
+        the discriminator can be configured by setting the
+        ``_concrete_discriminator_name`` attribute.
 
         Example::
 
@@ -478,7 +479,10 @@ class ConcreteBase(object):
         if m.with_polymorphic:
             return
 
-        discriminator_name = _get_immediate_cls_attr(cls, "_concrete_discriminator_name") or "type"
+        discriminator_name = (
+            _get_immediate_cls_attr(cls, "_concrete_discriminator_name")
+            or "type"
+        )
 
         mappers = list(m.self_and_descendants)
         pjoin = cls._create_polymorphic_union(mappers, discriminator_name)
@@ -627,7 +631,10 @@ class AbstractConcreteBase(ConcreteBase):
             if mn is not None:
                 mappers.append(mn)
 
-        discriminator_name = _get_immediate_cls_attr(cls, "_concrete_discriminator_name") or "type"
+        discriminator_name = (
+            _get_immediate_cls_attr(cls, "_concrete_discriminator_name")
+            or "type"
+        )
         pjoin = cls._create_polymorphic_union(mappers, discriminator_name)
 
         # For columns that were declared on the class, these
@@ -647,7 +654,7 @@ class AbstractConcreteBase(ConcreteBase):
 
         def mapper_args():
             args = m_args()
-            args["polymorphic_on"] = pjoin.c[discriminator_name]            
+            args["polymorphic_on"] = pjoin.c[discriminator_name]
             return args
 
         to_map.mapper_args_fn = mapper_args

diff --git a/test/ext/declarative/test_inheritance.py b/test/ext/declarative/test_inheritance.py
index 726169622ee157beeec3a96d10154cdc79f4e552..4a4e8a00f5dfba96656d9a3b592e3124545cd916 100644 (file)
--- a/test/ext/declarative/test_inheritance.py
+++ b/test/ext/declarative/test_inheritance.py
@@ -2043,9 +2043,7 @@ class ConcreteExtensionConfigTest(
         """test #5513"""
 
         class Employee(AbstractConcreteBase, Base):
-            _concrete_discriminator_name = (
-                "_alternative_concrete_discriminator"
-            )
+            _concrete_discriminator_name = "_alt_discriminator"
             employee_id = Column(Integer, primary_key=True)
 
         class Manager(Employee):
@@ -2068,10 +2066,10 @@ class ConcreteExtensionConfigTest(
         self.assert_compile(
             Session().query(Employee),
             "SELECT pjoin.employee_id AS pjoin_employee_id, "
-            "pjoin._alternative_concrete_discriminator AS pjoin__alternative_concrete_discriminator "
+            "pjoin._alt_discriminator AS pjoin__alt_discriminator "
             "FROM (SELECT engineer.employee_id AS employee_id, "
-            "'engineer' AS _alternative_concrete_discriminator "
-            "FROM engineer UNION ALL SELECT manager.employee_id AS employee_id, "
-            "'manager' AS _alternative_concrete_discriminator "
+            "'engineer' AS _alt_discriminator FROM engineer "
+            "UNION ALL SELECT manager.employee_id AS employee_id, "
+            "'manager' AS _alt_discriminator "
             "FROM manager) AS pjoin",
         )