commit 7c142b4d3a6646f531574bba77c283ffc0a479d0 Author: Isis Lovecruft isis@torproject.org Date: Sun May 10 22:23:00 2015 +0000
Remove extra whitespace from bridgedb.bridges.Bridge docstring.
Conflicts: lib/bridgedb/bridges.py --- lib/bridgedb/bridges.py | 13 ------------- 1 file changed, 13 deletions(-)
diff --git a/lib/bridgedb/bridges.py b/lib/bridgedb/bridges.py index 65acbc7..37e17cd 100644 --- a/lib/bridgedb/bridges.py +++ b/lib/bridgedb/bridges.py @@ -775,16 +775,12 @@ class Bridge(BridgeBackwardsCompatibility): :type fingerprint: str or ``None`` :ivar fingerprint: This ``Bridge``'s fingerprint, in lowercased hexadecimal format. - :type nickname: str or ``None`` :ivar nickname: This ``Bridge``'s router nickname. - :type socksPort: int :ivar socksPort: This ``Bridge``'s SOCKSPort. Should always be ``0``. - :type dirPort: int :ivar dirPort: This ``Bridge``'s DirPort. Should always be ``0``. - :type orAddresses: list :ivar orAddresses: A list of 3-tuples in the form:: (ADDRESS, PORT, IP_VERSION) @@ -792,39 +788,30 @@ class Bridge(BridgeBackwardsCompatibility): * ADDRESS is an :class:`ipaddr.IPAddress`, * PORT is an ``int``, * IP_VERSION is either ``4`` or ``6``. - :type transports: list :ivar transports: A list of :class:`PluggableTransport`s, one for each transport that this :class:`Bridge` currently supports. - :type flags: :class:`~bridgedb.bridges.Flags` :ivar flags: All flags assigned by the BridgeAuthority to this :class:`Bridge`. - :type hibernating: bool :ivar hibernating: ``True`` if this :class:`Bridge` is hibernating and not currently serving clients (e.g. if the Bridge hit its configured ``RelayBandwidthLimit``); ``False`` otherwise. - :type _blockedIn: dict :ivar _blockedIn: A dictionary of ``ADDRESS:PORT`` pairs to lists of lowercased, two-letter country codes (e.g. ``"us"``, ``"gb"``, ``"cn"``, etc.) which that ``ADDRESS:PORT`` pair is blocked in. - :type contact: str or ``None`` :ivar contact: The contact information for the this Bridge's operator. - :type family: set or ``None`` :ivar family: The fingerprints of other Bridges related to this one. - :type platform: str or ``None`` :ivar platform: The ``platform`` line taken from the ``@type bridge-server-descriptor``, e.g. ``'Tor 0.2.5.4-alpha on Linux'``. - :type software: :api:`stem.version.Version` or ``None`` :ivar software: The OR version portion of the ``platform`` line. - :type os: str or None :ivar os: The OS portion of the ``platform`` line. """