From: Brian Wellington <bwelling@xbill.org>
Date: Thu, 9 Jul 2020 23:51:26 +0000 (-0700)
Subject: Fix _wordbreak() to always return a str.
X-Git-Tag: v2.0.0~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=540e0d1f7d59e959b735cd1364ec9f2e32249e56;p=thirdparty%2Fdnspython.git

Fix _wordbreak() to always return a str.
---

diff --git a/dns/rdata.py b/dns/rdata.py
index 17636afa..e114fe32 100644
--- a/dns/rdata.py
+++ b/dns/rdata.py
@@ -34,15 +34,16 @@ import dns.tokenizer
 _chunksize = 32
 
 
-def _wordbreak(line, chunksize=_chunksize):
-    """Break a string into chunks of chunksize characters separated by a space.
+def _wordbreak(data, chunksize=_chunksize):
+    """Break a binary string into chunks of chunksize characters separated by
+    a space.
     """
 
     if not chunksize:
-        return line
-    return b' '.join([line[i:i + chunksize]
+        return data.decode()
+    return b' '.join([data[i:i + chunksize]
                       for i
-                      in range(0, len(line), chunksize)]).decode()
+                      in range(0, len(data), chunksize)]).decode()
 
 
 def _hexify(data, chunksize=_chunksize):