[tor-commits] [bridgedb/develop] Fix misleading comments.

[phw at torproject.org]

commit 116be8e57f862dbd04e7cb760b86097719d84ee7
Author: Philipp Winter <phw at nymity.ch>
Date:   Tue Feb 18 14:12:08 2020 -0800

    Fix misleading comments.
---
 bridgedb/bridges.py                   |  7 +++----
 bridgedb/distributors/https/server.py |  5 +----
 bridgedb/distributors/moat/server.py  |  3 +--
 bridgedb/i18n/templates/bridgedb.pot  | 13 +++++--------
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/bridgedb/bridges.py b/bridgedb/bridges.py
index cf90b3b..ca1330b 100644
--- a/bridgedb/bridges.py
+++ b/bridgedb/bridges.py
@@ -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
diff --git a/bridgedb/distributors/https/server.py b/bridgedb/distributors/https/server.py
index 69f04a3..660d34e 100644
--- a/bridgedb/distributors/https/server.py
+++ b/bridgedb/distributors/https/server.py
@@ -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"
     #
diff --git a/bridgedb/distributors/moat/server.py b/bridgedb/distributors/moat/server.py
index cb53b32..97dfc42 100644
--- a/bridgedb/distributors/moat/server.py
+++ b/bridgedb/distributors/moat/server.py
@@ -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.
         """
diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot
index 483abbc..be57a8b 100644
--- a/bridgedb/i18n/templates/bridgedb.pot
+++ b/bridgedb/i18n/templates/bridgedb.pot
@@ -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 at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at 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 ""