[tor-commits] [bridgedb/master] Call Distributor.setDistributorName() in subclass __init__s.

[isis@xxxxxxxxxxxxxx]

commit e7018ff65d1952874a834357c06d7fbaa343c33f
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Sun Jan 12 03:59:20 2014 +0000

    Call Distributor.setDistributorName() in subclass __init__s.
---
 lib/bridgedb/Dist.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/bridgedb/Dist.py b/lib/bridgedb/Dist.py
index 8357ca6..84e9c75 100644
--- a/lib/bridgedb/Dist.py
+++ b/lib/bridgedb/Dist.py
@@ -154,7 +154,7 @@ class IPBasedDistributor(Distributor):
         logging.debug("Added splitter %s to IPBasedDistributor."
                       % self.splitter.__class__)
 
-        self.setDistributorName(self.__class__.__name__)
+        self.setDistributorName('HTTPS')
 
     def prepopulateRings(self):
         # populate all rings (for dumping assignments and testing)
@@ -432,6 +432,8 @@ class EmailBasedDistributor(Distributor):
         self.splitter = bridgedb.Bridges.FilteredBridgeSplitter(
             key2, max_cached_rings=5)
 
+        self.setDistributorName('Email')
+
     def clear(self):
         self.splitter.clear()
         #self.ring.clear() # should be take care of by above



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits