From 358f25c6d87eda6f80553f599c76fac36b50df4f Mon Sep 17 00:00:00 2001 From: Max Goodman Date: Thu, 2 May 2013 19:47:46 -0700 Subject: [PATCH] Count subreddits (not properties) in the multi subreddit limit. --- r2/r2/models/subreddit.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py index a012def52..9e2729196 100644 --- a/r2/r2/models/subreddit.py +++ b/r2/r2/models/subreddit.py @@ -1361,12 +1361,14 @@ class LabeledMulti(tdb_cassandra.Thing, MultiReddit): remaining = self.MAX_SR_COUNT + 10 sr_columns = {} for k, v in self._t.iteritems(): + if not k.startswith(self.SR_PREFIX): + continue + + sr_columns[k] = v + + remaining -= 1 if remaining <= 0: break - remaining -= 1 - - if k.startswith(self.SR_PREFIX): - sr_columns[k] = v return self.columns_to_sr_props(sr_columns) @property