Unverified Commit 116be8e5 authored by Philipp Winter's avatar Philipp Winter
Browse files

Fix misleading comments.

parent fd960bdd

bridgedb/bridges.py

+3 −4
Original line number Diff line number Diff line
@@ -335,8 +335,7 @@ class PluggableTransport(BridgeAddressBase): 
    :vartype methodname: str

    :ivar methodname: The canonical "name" for this pluggable transport,

        i.e. the one which would be specified in a torrc file. For example,

        ``"obfs2"``, ``"obfs3"``, ``"scramblesuit"`` would all be pluggable

        transport method names.

        ``"obfs4"``.



    :vartype address: ``ipaddr.IPv4Address`` or ``ipaddr.IPv6Address``

    :ivar address: The IP address of the transport. Currently (as of 20 March
@@ -514,7 +513,7 @@ class PluggableTransport(BridgeAddressBase): 


        :rtype: str

        :returns: The (lowercased) methodname of this ``PluggableTransport``,

            i.e. ``"obfs3"``, ``"scramblesuit"``, etc.

            e.g. ``"obfs4"``.

        """

        return self._methodname
@@ -1413,7 +1412,7 @@ class Bridge(BridgeBackwardsCompatibility): 


        :param str countryCode: A two-character country code specifier.

        :param str methodname: The type of pluggable transport to check,

            i.e. ``'obfs3'``.

            e.g. ``'obfs4'``.

        :rtype: bool

        :returns: ``True`` if any address:port pair which this bridge is

            running a :class:`PluggableTransport` on is blocked in

bridgedb/distributors/https/server.py

+1 −4
Original line number Diff line number Diff line
@@ -128,10 +128,7 @@ def replaceErrorPage(request, error, template_name=None, html=True): 
    # "BridgeDB"

    # "pluggable transport"

    # "pluggable transports"

    # "obfs2"

    # "obfs3"

    # "scramblesuit"

    # "fteproxy"

    # "obfs4"

    # "Tor"

    # "Tor Browser"

    #

bridgedb/distributors/moat/server.py

+1 −2
Original line number Diff line number Diff line
@@ -406,8 +406,7 @@ class CaptchaFetchResource(CaptchaResource): 
                * "type": "client-transports".

                * "supported": ['TRANSPORT', … ]

            where:

                * TRANSPORT is a string identifying a transport, e.g. "obfs3" or

                  "obfs4".

                * TRANSPORT is a string identifying a transport, e.g. "obfs4".

        :rtype: list

        :returns: The list of transports the client supports.

        """

bridgedb/i18n/templates/bridgedb.pot

+5 −8
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ 
#

msgid ""

msgstr ""

"Project-Id-Version: bridgedb 0.9.0+19.ga5fa455.dirty\n"

"Project-Id-Version: bridgedb 0.9.2+5.gfd960bd.dirty\n"

"Report-Msgid-Bugs-To: "

"'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords"

"=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"

"POT-Creation-Date: 2020-02-04 10:59-0800\n"

"POT-Creation-Date: 2020-02-18 13:39-0800\n"

"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"

"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,13 +42,10 @@ msgstr "" 
#. "BridgeDB"

#. "pluggable transport"

#. "pluggable transports"

#. "obfs2"

#. "obfs3"

#. "scramblesuit"

#. "fteproxy"

#. "obfs4"

#. "Tor"

#. "Tor Browser"

#: bridgedb/distributors/https/server.py:138

#: bridgedb/distributors/https/server.py:135

msgid "Sorry! Something went wrong with your request."

msgstr ""
@@ -270,7 +267,7 @@ msgid "" 
"\n"

msgstr ""



#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383

#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356

msgid "What are bridges?"

msgstr ""