Refactor participant mixins

Flat is better than nested.
gratipay · Feb 20, 2017 · 0cf5c2b · 0cf5c2b
1 parent 436475f
commit 0cf5c2b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/gratipay/models/participant/__init__.py b/gratipay/models/participant/__init__.py
@@ -38,7 +38,6 @@
 from gratipay.models.exchange_route import ExchangeRoute
 from gratipay.models.team import Team
 from gratipay.models.team.mixins.takes import ZERO
-from gratipay.models.participant import mixins
 from gratipay.security.crypto import constant_time_compare
 from gratipay.utils import (
     i18n,
@@ -51,6 +50,7 @@
 )
 from gratipay.utils.username import safely_reserve_a_username
 
+from .identity import Identity
 
 ASCII_ALLOWED_IN_USERNAME = set("0123456789"
                                 "abcdefghijklmnopqrstuvwxyz"
@@ -63,7 +63,7 @@
 USERNAME_MAX_SIZE = 32
 
 
-class Participant(Model, mixins.Identity):
+class Participant(Model, Identity):
     """Represent a Gratipay participant.
     """
 

diff --git a/...pay/models/participant/mixins/identity.py → gratipay/models/participant/identity.py b/...pay/models/participant/mixins/identity.py → gratipay/models/participant/identity.py
@@ -20,7 +20,7 @@ def _validate_info(schema_name, info):
     return None
 
 
-class IdentityMixin(object):
+class Identity(object):
     """This mixin provides management of national identities for
     :py:class:`~gratipay.models.participant.Participant` objects.
 

diff --git a/gratipay/models/participant/mixins/__init__.py b/gratipay/models/participant/mixins/__init__.py
diff --git a/gratipay/wireup.py b/gratipay/wireup.py
@@ -33,8 +33,7 @@
 from gratipay.models.community import Community
 from gratipay.models.country import Country
 from gratipay.models.exchange_route import ExchangeRoute
-from gratipay.models.participant import Participant
-from gratipay.models.participant.mixins import Identity
+from gratipay.models.participant import Participant, Identity
 from gratipay.models.team import Team
 from gratipay.models import GratipayDB
 from gratipay.security.crypto import EncryptingPacker

diff --git a/tests/py/test_participant_identities.py b/tests/py/test_participant_identities.py
@@ -2,10 +2,10 @@
 
 from cryptography.fernet import InvalidToken
 from gratipay.testing import Harness, P
-from gratipay.models.participant.mixins import identity, Identity
-from gratipay.models.participant.mixins.identity import _validate_info, rekey
-from gratipay.models.participant.mixins.identity import ParticipantIdentityInfoInvalid
-from gratipay.models.participant.mixins.identity import ParticipantIdentitySchemaUnknown
+from gratipay.models.participant import identity
+from gratipay.models.participant.identity import _validate_info, rekey
+from gratipay.models.participant.identity import ParticipantIdentityInfoInvalid
+from gratipay.models.participant.identity import ParticipantIdentitySchemaUnknown
 from gratipay.security.crypto import EncryptingPacker, Fernet
 from postgres.orm import ReadOnly
 from psycopg2 import IntegrityError
@@ -148,7 +148,7 @@ def test_sii_validates_identity(self):
                )
 
     def test_sii_happily_overwrites_schema_name(self):
-        packed = Identity.encrypting_packer.pack({'name': 'Crusher'})
+        packed = identity.Identity.encrypting_packer.pack({'name': 'Crusher'})
         self.db.run( "INSERT INTO participant_identities "
                      "(participant_id, country_id, schema_name, info) "
                      "VALUES (%s, %s, %s, %s)"

diff --git a/tests/py/test_security.py b/tests/py/test_security.py
@@ -8,7 +8,7 @@
 from base64 import urlsafe_b64decode
 from cryptography.fernet import Fernet, InvalidToken
 from gratipay import security
-from gratipay.models.participant.mixins import Identity
+from gratipay.models.participant import Identity
 from gratipay.security.crypto import EncryptingPacker
 from gratipay.testing import Harness
 from pytest import raises