Changeset efac902 in trunk

Timestamp:

2020-12-11T16:23:02Z (4 years ago)

Author:

Jean-Paul Calderone <exarkun@…>

Branches:

master

Children:

9a8f7220

Parents:

9259264

git-author:

Jean-Paul Calderone <exarkun@…> (2020-12-11 16:22:39)

git-committer:

Jean-Paul Calderone <exarkun@…> (2020-12-11 16:23:02)

Message:

Slightly better user-facing privacy error message here

Location:

src/allmydata

Files:

• node.py (modified) (1 diff)
• test/test_connections.py (modified) (1 diff)

src/allmydata/node.py ¶

@@ -655 +655 @@
     if not reveal_ip:
         if default_connection_handlers.get("tcp") == "tcp":
-            raise PrivacyError("tcp = tcp, must not be set to 'tcp'")
+            raise PrivacyError(
+                "Privacy requested with `reveal-IP-address = false` "
+                "but `tcp = tcp` conflicts with this.",
+            )
     return default_connection_handlers
 

src/allmydata/test/test_connections.py ¶

@@ -413 +413 @@
         self.assertEqual(
             str(ctx.exception),
-            "tcp = tcp, must be set to 'tor' or 'disabled'",
+            "Privacy requested with `reveal-IP-address = false` "
+            "but `tcp = tcp` conflicts with this.",
         )