diff --git a/r2/r2/lib/utils/utils.py b/r2/r2/lib/utils/utils.py index 2cbf1e0cc..f5cd14014 100644 --- a/r2/r2/lib/utils/utils.py +++ b/r2/r2/lib/utils/utils.py @@ -913,12 +913,6 @@ def common_subdomain(domain1, domain2): return d return "" -def interleave_lists(*args): - max_len = max(len(x) for x in args) - for i in xrange(max_len): - for a in args: - if i < len(a): - yield a[i] def link_from_url(path, filter_spam = False, multiple = True): from pylons import c diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py index 9ddbbbbb0..8b9bf6ce5 100644 --- a/r2/r2/models/subreddit.py +++ b/r2/r2/models/subreddit.py @@ -40,7 +40,7 @@ from r2.lib.db.operators import lower, or_, and_, desc from r2.lib.errors import UserRequiredException from r2.lib.memoize import memoize from r2.lib.permissions import ModeratorPermissionSet -from r2.lib.utils import tup, interleave_lists, last_modified_multi, flatten +from r2.lib.utils import tup, last_modified_multi from r2.lib.utils import timeago, summarize_markdown from r2.lib.cache import sgm from r2.lib.strings import strings, Score