Remove the __len__() method from all Distributors.

isislovecruft · Apr 19, 2015 · acaf3c1 · acaf3c1
1 parent 518a431
commit acaf3c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py
@@ -346,9 +346,6 @@ def getBridges(self, bridgeRequest, interval):
 
         return answer
 
-    def __len__(self):
-        return len(self.hashring)
-
     def dumpAssignments(self, f, description=""):
         self.hashring.dumpAssignments(f, description)
 
@@ -474,9 +471,6 @@ def getBridges(self, bridgeRequest, interval):
 
         return result
 
-    def __len__(self):
-        return len(self.hashring)
-
     def cleanDatabase(self):
         with bridgedb.Storage.getDB() as db:
             try:

diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py
@@ -254,7 +254,7 @@ def createBridgeRings(cfg, proxyList, key):
             crypto.getHMAC(key, "HTTPS-IP-Dist-Key"),
             proxyList,
             answerParameters=ringParams)
-        hashring.addRing(ipDistributor, "https", cfg.HTTPS_SHARE)
+        hashring.addRing(ipDistributor.hashring, "https", cfg.HTTPS_SHARE)
 
     # As appropriate, create an email-based distributor.
     if cfg.EMAIL_DIST and cfg.EMAIL_SHARE:
@@ -265,7 +265,7 @@ def createBridgeRings(cfg, proxyList, key):
             cfg.EMAIL_DOMAIN_RULES.copy(),
             answerParameters=ringParams,
             whitelist=cfg.EMAIL_WHITELIST.copy())
-        hashring.addRing(emailDistributor, "email", cfg.EMAIL_SHARE)
+        hashring.addRing(emailDistributor.hashring, "email", cfg.EMAIL_SHARE)
 
     # As appropriate, tell the hashring to leave some bridges unallocated.
     if cfg.RESERVED_SHARE: