From 680a5a0575adbb237e050478bfffaaa0452b3878 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Fri, 12 Feb 2021 14:26:08 -0500
Subject: [PATCH] mangling no longer a thing

---
 src/allmydata/test/test_runner.py  | 2 +-
 src/allmydata/util/encodingutil.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py
index 6ed9a65c6..0a71f45a3 100644
--- a/src/allmydata/test/test_runner.py
+++ b/src/allmydata/test/test_runner.py
@@ -86,7 +86,7 @@ class ParseOptionsTests(SyncTestCase):
         """
         tricky = u"\u2621"
         try:
-            parse_options([unicode_to_argv(tricky, mangle=True)])
+            parse_options([unicode_to_argv(tricky)])
         except usage.error as e:
             self.assertEqual(
                 b"Unknown command: " + tricky.encode("utf-8"),
diff --git a/src/allmydata/util/encodingutil.py b/src/allmydata/util/encodingutil.py
index 483871b5d..4e1cf57ba 100644
--- a/src/allmydata/util/encodingutil.py
+++ b/src/allmydata/util/encodingutil.py
@@ -126,7 +126,7 @@ def argv_to_abspath(s, **kwargs):
     return abspath_expanduser_unicode(decoded, **kwargs)
 
 
-def unicode_to_argv(s, mangle=False):
+def unicode_to_argv(s):
     """
     Make the given unicode string suitable for use in an argv list.