commit 509fb2094d6cc02ba889bbc0a6883447e3131e7e
Author: Isis Lovecruft <i...@torproject.org>
Date: Thu Apr 16 04:14:52 2015 +0000
Remove `countryCode` parameter from BridgeRing.getBridges().
It was never used. And it's unnecessary.
---
lib/bridgedb/Bridges.py | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py
index 988d464..a13a73e 100644
--- a/lib/bridgedb/Bridges.py
+++ b/lib/bridgedb/Bridges.py
@@ -283,28 +283,17 @@ class BridgeRing(BridgeHolder):
assert len(r) == N
return r
- def getBridges(self, pos, N=1, countryCode=None):
+ def getBridges(self, pos, N=1):
"""Return **N** bridges appearing in this hashring after a position.
:param bytes pos: The position to jump to. Any bridges returned will
- start at this position in the hashring, if there is
- a bridge assigned to that position. Otherwise,
- indexing will start at the first position after this
- one which has a bridge assigned to it.
+ start at this position in the hashring, if there is a bridge
+ assigned to that position. Otherwise, indexing will start at the
+ first position after this one which has a bridge assigned to it.
:param int N: The number of bridges to return.
- :type countryCode: str or None
- :param countryCode: DOCDOC
:rtype: list
- :returns: A list of :class:`~bridgedb.Bridges.Bridge`s.
+ :returns: A list of :class:`~bridgedb.bridges.Bridge`s.
"""
- # XXX This can be removed after we determine if countryCode is ever
- # actually being used. It seems the countryCode should be passed in
- # from bridgedb.https.server.WebResource.getBridgeRequestAnswer() in
- # order to hand out bridges which are believed to not be blocked in a
- # given country.
- if countryCode:
- logging.debug("getBridges: countryCode=%r" % countryCode)
-
forced = []
for _, _, count, subring in self.subrings:
if len(subring) < count:
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
