From bca77a368714205f8259faa79272d326cff216c1 Mon Sep 17 00:00:00 2001
From: collerek <collerek@gmail.com>
Date: Tue, 5 Jan 2021 15:30:39 +0100
Subject: [PATCH] fix minor code smells

---
 ormar/fields/foreign_key.py        | 2 --
 ormar/fields/model_fields.py       | 1 -
 ormar/models/helpers/models.py     | 3 +--
 tests/test_inheritance_concrete.py | 4 +---
 tests/test_inheritance_mixins.py   | 4 +---
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/ormar/fields/foreign_key.py b/ormar/fields/foreign_key.py
index 7a6bcb0..94a93d5 100644
--- a/ormar/fields/foreign_key.py
+++ b/ormar/fields/foreign_key.py
@@ -72,8 +72,6 @@ class UniqueColumns(UniqueConstraint):
     Used to avoid importing anything from sqlalchemy by user.
     """
 
-    pass
-
 
 @dataclass
 class ForeignKeyConstraint:
diff --git a/ormar/fields/model_fields.py b/ormar/fields/model_fields.py
index 4a30ee3..2222b78 100644
--- a/ormar/fields/model_fields.py
+++ b/ormar/fields/model_fields.py
@@ -112,7 +112,6 @@ class ModelFieldFactory:
         :param kwargs: all params passed during construction
         :type kwargs: Any
         """
-        pass
 
 
 class String(ModelFieldFactory, str):
diff --git a/ormar/models/helpers/models.py b/ormar/models/helpers/models.py
index 61da7bb..4c899d3 100644
--- a/ormar/models/helpers/models.py
+++ b/ormar/models/helpers/models.py
@@ -79,5 +79,4 @@ def validate_related_names_in_relations(
                     f"default/empty name: '{new_model.get_name() + 's'}'"
                     f"\nTip: provide different related_name for FK and/or M2M fields"
                 )
-            else:
-                previous_related_names.append(field.related_name)
+            previous_related_names.append(field.related_name)
diff --git a/tests/test_inheritance_concrete.py b/tests/test_inheritance_concrete.py
index 27e3dfb..90e4c35 100644
--- a/tests/test_inheritance_concrete.py
+++ b/tests/test_inheritance_concrete.py
@@ -4,7 +4,6 @@ from typing import List, Optional
 
 import databases
 import pytest
-import sqlalchemy
 import sqlalchemy as sa
 from sqlalchemy import create_engine
 
@@ -196,8 +195,7 @@ def test_field_redefining_in_concrete_models():
     assert changed_field.alias == "creation_date"
     assert any(x.name == "creation_date" for x in RedefinedField.Meta.table.columns)
     assert isinstance(
-        RedefinedField.Meta.table.columns["creation_date"].type,
-        sqlalchemy.sql.sqltypes.String,
+        RedefinedField.Meta.table.columns["creation_date"].type, sa.sql.sqltypes.String,
     )
 
 
diff --git a/tests/test_inheritance_mixins.py b/tests/test_inheritance_mixins.py
index 6a580a1..bb423f1 100644
--- a/tests/test_inheritance_mixins.py
+++ b/tests/test_inheritance_mixins.py
@@ -4,12 +4,10 @@ from typing import Optional
 
 import databases
 import pytest
-import sqlalchemy
 import sqlalchemy as sa
 from sqlalchemy import create_engine
 
 import ormar
-from ormar import ModelDefinitionError
 from tests.settings import DATABASE_URL
 
 metadata = sa.MetaData()
@@ -94,7 +92,7 @@ def test_field_redefining_in_second_raises_error():
     assert any(x.name == "creation_date" for x in RedefinedField2.Meta.table.columns)
     assert isinstance(
         RedefinedField2.Meta.table.columns["creation_date"].type,
-        sqlalchemy.sql.sqltypes.String,
+        sa.sql.sqltypes.String,
     )