More unicode-of-bytes fixes.

src/allmydata/blacklist.py

@@ -63,7 +63,7 @@ class Blacklist(object):
         reason = self.entries.get(si, None)
         if reason is not None:
             # log this to logs/twistd.log, since web logs go there too
-            twisted_log.msg("blacklist prohibited access to SI %s: %s" %
+            twisted_log.msg("blacklist prohibited access to SI %r: %r" %
                             (base32.b2a(si), reason))
         return reason
 

src/allmydata/hashtree.py

@@ -430,8 +430,8 @@ class IncompleteHashTree(CompleteBinaryTreeMixin, list):
             for i,h in new_hashes.items():
                 if self[i]:
                     if self[i] != h:
-                        raise BadHashError("new hash %s does not match "
+                        raise BadHashError("new hash %r does not match "
-                                           "existing hash %s at %s"
+                                           "existing hash %r at %r"
                                            % (base32.b2a(h),
                                               base32.b2a(self[i]),
                                               self._name_hash(i)))

src/allmydata/immutable/downloader/fetcher.py

@@ -63,7 +63,7 @@ class SegmentFetcher(object):
         self._running = True
 
     def stop(self):
-        log.msg("SegmentFetcher(%s).stop" % self._node._si_prefix,
+        log.msg("SegmentFetcher(%r).stop" % self._node._si_prefix,
                 level=log.NOISY, parent=self._lp, umid="LWyqpg")
         self._cancel_all_requests()
         self._running = False
@@ -241,7 +241,7 @@ class SegmentFetcher(object):
         # called by Shares, in response to our s.send_request() calls.
         if not self._running:
             return
-        log.msg("SegmentFetcher(%s)._block_request_activity: %s -> %s" %
+        log.msg("SegmentFetcher(%r)._block_request_activity: %s -> %r" %
                 (self._node._si_prefix, repr(share), state),
                 level=log.NOISY, parent=self._lp, umid="vilNWA")
         # COMPLETE, CORRUPT, DEAD, BADSEGNUM are terminal. Remove the share

src/allmydata/immutable/downloader/node.py

@@ -125,7 +125,7 @@ class DownloadNode(object):
         self.ciphertext_hash_tree_leaves = self.guessed_num_segments
 
     def __repr__(self):
-        return "ImmutableDownloadNode(%s)" % (self._si_prefix,)
+        return "ImmutableDownloadNode(%r)" % (self._si_prefix,)
 
     def stop(self):
         # called by the Terminator at shutdown, mostly for tests

src/allmydata/mutable/retrieve.py

@@ -122,7 +122,7 @@ class Retrieve(object):
         _assert(self._node.get_readkey())
         self._last_failure = None
         prefix = si_b2a(self._storage_index)[:5]
-        self._log_number = log.msg("Retrieve(%s): starting" % prefix)
+        self._log_number = log.msg("Retrieve(%r): starting" % prefix)
         self._running = True
         self._decoding = False
         self._bad_shares = set()

src/allmydata/node.py

@@ -915,7 +915,7 @@ def create_main_tub(config, tub_options,
             tubport,
             location,
         )
-        log.msg("Tub location set to %s" % (location,))
+        log.msg("Tub location set to %r" % (location,))
     return tub
 
 

src/allmydata/storage/server.py

@@ -703,7 +703,7 @@ class StorageServer(service.MultiService, Referenceable):
         si_s = si_b2a(storage_index)
         # windows can't handle colons in the filename
         fn = os.path.join(self.corruption_advisory_dir,
-                          "%s--%s-%d" % (now, si_s, shnum)).replace(":","")
+                          "%s--%s-%d" % (now, str(si_s, "utf-8"), shnum)).replace(":","")
         with open(fn, "w") as f:
             f.write("report: Share Corruption\n")
             f.write("type: %s\n" % bytes_to_native_str(share_type))

src/allmydata/test/common.py

@@ -843,7 +843,7 @@ class WebErrorMixin(object):
             response_body = f.value.response
             if response_substring:
                 self.failUnless(response_substring in response_body,
-                                "%s: response substring '%s' not in '%s'"
+                                "%r: response substring %r not in %r"
                                 % (which, response_substring, response_body))
             return response_body
         d = defer.maybeDeferred(callable, *args, **kwargs)