Merge branch 'master' into payday-dashboard

gratipay/models/participant/__init__.py

@@ -37,8 +37,7 @@
 from gratipay.models.account_elsewhere import AccountElsewhere
 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.models.team.takes import ZERO
 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.
     """
 

gratipay/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.
 

gratipay/models/team/__init__.py

@@ -10,9 +10,14 @@
 from gratipay.billing.exchanges import MINIMUM_CHARGE
 from gratipay.exceptions import InvalidTeamName
 from gratipay.models import add_event
-from gratipay.models.team import mixins
 from postgres.orm import Model
 
+from .available import Available
+from .closing import Closing
+from .membership import Membership
+from .takes import Takes
+from .tip_migration import TipMigration
+
 
 # Should have at least one letter.
 TEAM_NAME_PATTERN = re.compile(r'^(?=.*[A-Za-z])([A-Za-z0-9.,-_ ]+)$')
@@ -33,8 +38,7 @@ def slugize(name):
     return slug
 
 
-class Team(Model, mixins.Available, mixins.Closing, mixins.Membership, mixins.Takes,
-                                                                              mixins.TipMigration):
+class Team(Model, Available, Closing, Membership, Takes, TipMigration):
     """Represent a Gratipay team.
     """
 

gratipay/models/team/mixins/available.py → gratipay/models/team/available.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 
-class AvailableMixin(object):
+class Available(object):
     """Teams can make money available for their members to take.
     """
 

gratipay/models/team/mixins/closing.py → gratipay/models/team/closing.py

@@ -4,7 +4,7 @@
 from gratipay.models import add_event
 
 
-class ClosingMixin(object):
+class Closing(object):
     """This mixin implements team closing.
     """
 

gratipay/models/team/mixins/membership.py → gratipay/models/team/membership.py

@@ -3,7 +3,7 @@
 from .takes import ZERO, PENNY
 
 
-class MembershipMixin(object):
+class Membership(object):
     """Teams may have zero or more members, who are participants that take money from the team.
     """
 

gratipay/models/team/mixins/takes.py → gratipay/models/team/takes.py

@@ -7,7 +7,7 @@
 PENNY = D('0.01')
 
 
-class TakesMixin(object):
+class Takes(object):
     """:py:class:`~gratipay.models.participant.Participant` s who are members
     of a :py:class:`~gratipay.models.team.Team` may take money from the team
     during :py:class:`~gratipay.billing.payday.Payday`. Only the team owner may

gratipay/models/team/mixins/tip_migration.py → gratipay/models/team/tip_migration.py

@@ -5,7 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 
-class TipMigrationMixin(object):
+class TipMigration(object):
     """This mixin provides tip migration for teams.
     """
 

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

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)"

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

tests/py/test_team_membership.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 from test_team_takes import TeamTakesHarness, PENNY
-from gratipay.models.team import mixins
+from gratipay.models.team.membership import Membership
 
 
 class Tests(TeamTakesHarness):
@@ -15,7 +15,7 @@ def assert_memberships(self, *expected):
 
 
     def test_team_object_subclasses_takes_mixin(self):
-        assert isinstance(self.enterprise, mixins.Membership)
+        assert isinstance(self.enterprise, Membership)
 
 
     # gm - get_memberships

tests/py/test_team_takes.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 from pytest import raises
-from gratipay.models.team.mixins.takes import NotAllowed, PENNY, ZERO
+from gratipay.models.team.takes import NotAllowed, PENNY, ZERO
 from gratipay.testing import Harness, D,P,T
 from gratipay.testing.billing import PaydayMixin
 

tests/py/test_tip_migration.py

@@ -2,7 +2,7 @@
 
 import pytest
 from gratipay.testing import Harness
-from gratipay.models.team.mixins.tip_migration import AlreadyMigrated, migrate_all_tips
+from gratipay.models.team.tip_migration import AlreadyMigrated, migrate_all_tips
 
 
 class Tests(Harness):

tests/ttw/test_team_distributing.py

@@ -20,9 +20,9 @@ def test_owner_can_add_a_member(self):
         self.sign_in('picard')
         self.visit('/TheEnterprise/distributing/')
         self.css('.lookup-container .query').first.fill('alice')
-        time.sleep(0.2)
+        time.sleep(0.3)
         self.css('.lookup-container button').first.click()
-        time.sleep(0.2)
+        time.sleep(0.3)
         assert [a.text for a in self.css('table.team a')] == ['alice']
 
 

www/%team/distributing/%to.json.spt

@@ -6,7 +6,7 @@ from aspen import Response
 from babel.numbers import NumberFormatError
 from gratipay.utils import get_team
 from gratipay.models.participant import Participant
-from gratipay.models.team.mixins.takes import ZERO, PENNY
+from gratipay.models.team.takes import ZERO, PENNY
 
 [--------------------]
 request.allow('POST')