From d682759531caf424f1391488fdbcb57826765843 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 23 Oct 2019 09:54:08 -0400
Subject: [PATCH] Formatting and belt-and-suspenders to_uri calls

---
 nixos/modules/tests/exercise-storage.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/tests/exercise-storage.py b/nixos/modules/tests/exercise-storage.py
index 3603119e..cc09a43f 100755
--- a/nixos/modules/tests/exercise-storage.py
+++ b/nixos/modules/tests/exercise-storage.py
@@ -40,23 +40,31 @@ def get_api_root(path):
         return hyperlink.URL.from_text(f.read().strip())
 
 def tahoe_put(api_root, data, **kwargs):
-    response = requests.put(api_root.child(u"uri"), BytesIO(data))
+    response = requests.put(
+        api_root.child(u"uri").to_uri(),
+        BytesIO(data),
+    )
     response.raise_for_status()
     return response.text
 
 def tahoe_get(api_root, cap):
-    response = requests.get(api_root.child(u"uri", cap), stream=True)
+    response = requests.get(
+        api_root.child(u"uri", cap).to_uri(),
+        stream=True,
+    )
     response.raise_for_status()
     return response.raw.read()
 
 def tahoe_mkdir(api_root):
-    response = requests.post(api_root.child(u"uri").replace(query={u"t": u"mkdir", u"format": u"mdmf"}))
+    response = requests.post(
+        api_root.child(u"uri").replace(query={u"t": u"mkdir", u"format": u"mdmf"}).to_uri(),
+    )
     response.raise_for_status()
     return response.text
 
 def tahoe_link(api_root, dir_cap, name, subject_cap):
     response = requests.post(
-        api_root.child(u"uri", dir_cap, name).replace(query={u"t": u"uri"}),
+        api_root.child(u"uri", dir_cap, name).replace(query={u"t": u"uri"}).to_uri(),
         BytesIO(subject_cap),
     )
     response.raise_for_status()
-- 
GitLab