Skip to content

Commit 221f5ed

Browse files
committed
Fix MembershipService.get_current_membership_for_org() bug
So MembershipService.get_current_membership_for_org() doesn't crash when Subscription.expiration_date is None.
1 parent dd7b8bf commit 221f5ed

4 files changed

Lines changed: 10 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
## [Unreleased]
44
### Changed
55

6+
## [1.1.5]
7+
### Fixed `MembershipService.get_current_membership_for_org()` so it
8+
doesn't crash when `Subscription.expiration_date` is `None`.
9+
610
## [3.3.4] - 2018-02-05
711
### Breaking Changes
812

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ To authenticate and receive a session ID:
3535

3636
To take advantage of a service, for example `subscriptions`:
3737

38-
ORG_ID = #####
3938
service = SubscriptionService(self.client)
40-
subscription_list = service.get_subscriptions(org_id=ORG_ID)
39+
subscription_list = service.get_subscriptions(org_id=1)
4140

4241
## Running tests
4342

membersuite_api_client/memberships/services.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class MembershipService(ChunkQueryMixin, object):
1515

1616
def __init__(self, client):
1717
"""
18-
Accepts a ConciergeClient to connect with MemberSuite
18+
Requires a ConciergeClient to connect with MemberSuite
1919
"""
2020
self.client = client
2121

@@ -28,8 +28,9 @@ def get_current_membership_for_org(self, account_num, verbose=False):
2828
verbose=verbose)
2929
# Look for first membership that hasn't expired yet.
3030
for membership in all_memberships:
31-
if membership.expiration_date > datetime.datetime.now():
32-
return membership
31+
if (membership.expiration_date and
32+
membership.expiration_date > datetime.datetime.now()): # noqa
33+
return membership # noqa
3334
return None
3435

3536
def get_memberships_for_org(self, account_num, verbose=False):

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def read(fname):
99

1010

1111
setup(name='membersuite_api_client',
12-
version="1.1.4",
12+
version="1.1.5",
1313
description='MemberSuite API Client',
1414
author='AASHE',
1515
author_email='webdev@aashe.org',

0 commit comments

Comments
 (0)