diff options
| author | Barry Warsaw | 2014-12-13 10:55:57 -0500 |
|---|---|---|
| committer | Barry Warsaw | 2014-12-13 10:55:57 -0500 |
| commit | 03731dd2d3aac0c9610c3b17d28f6821343fc8ed (patch) | |
| tree | 4b977f3225d355ec42daf312b93b7ab407c827ee /src/mailman/app/subscriptions.py | |
| parent | e3e8b9215abb85b44fce001311332c2f7772e4bd (diff) | |
| download | mailman-03731dd2d3aac0c9610c3b17d28f6821343fc8ed.tar.gz mailman-03731dd2d3aac0c9610c3b17d28f6821343fc8ed.tar.zst mailman-03731dd2d3aac0c9610c3b17d28f6821343fc8ed.zip | |
Diffstat (limited to 'src/mailman/app/subscriptions.py')
| -rw-r--r-- | src/mailman/app/subscriptions.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mailman/app/subscriptions.py b/src/mailman/app/subscriptions.py index ac6368c2a..620b99c20 100644 --- a/src/mailman/app/subscriptions.py +++ b/src/mailman/app/subscriptions.py @@ -26,6 +26,8 @@ __all__ = [ ] +import six + from operator import attrgetter from passlib.utils import generate_password as generate from sqlalchemy import and_, or_ @@ -108,7 +110,7 @@ class SubscriptionService: # the parameter can either be an email address or a user id. query = [] if subscriber is not None: - if isinstance(subscriber, basestring): + if isinstance(subscriber, six.text_type): # subscriber is an email address. address = user_manager.get_address(subscriber) user = user_manager.get_user(subscriber) |
