From 033f9fbdb313b9a25f0fc27f33e157eaddb80aa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Dlouh=C3=BD?= Date: Fri, 5 Jan 2018 17:56:16 +0100 Subject: [PATCH] Python3: mark bytes explicitly --- linkcheck/network/__init__.py | 4 ++-- tests/test_strformat.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/linkcheck/network/__init__.py b/linkcheck/network/__init__.py index 77d6c708..1f6dbd5b 100644 --- a/linkcheck/network/__init__.py +++ b/linkcheck/network/__init__.py @@ -108,7 +108,7 @@ class IfConfig (object): # 80kB buffer should be enough for most boxen max_bufsize = bufsize * 10 while True: - buf = array.array('c', '\0' * bufsize) + buf = array.array('b', b'\0' * bufsize) ifreq = struct.pack("iP", buf.buffer_info()[1], buf.buffer_info()[0]) try: result = self._ioctl(self.SIOCGIFCONF, ifreq) @@ -127,7 +127,7 @@ class IfConfig (object): while i < size: ifconf = data[i:i+self.ifr_size] name = struct.unpack("16s%ds" % (self.ifr_size-16), ifconf)[0] - name = name.split('\0', 1)[0] + name = name.split(b'\0', 1)[0] if name: if flags and not (self.getFlags(name) & flags): continue diff --git a/tests/test_strformat.py b/tests/test_strformat.py index 75ea0eb6..5ff7cf85 100644 --- a/tests/test_strformat.py +++ b/tests/test_strformat.py @@ -169,9 +169,9 @@ class TestStrFormat (unittest.TestCase): def test_ascii_safe (self): ascii_safe = linkcheck.strformat.ascii_safe - self.assertEqual(ascii_safe("a"), "a") - self.assertEqual(ascii_safe(u"a"), "a") - self.assertEqual(ascii_safe(u"ä"), "") + self.assertEqual(ascii_safe("a"), b"a") + self.assertEqual(ascii_safe(u"a"), b"a") + self.assertEqual(ascii_safe(u"ä"), b"") def test_strip_control_chars(self): strip = linkcheck.strformat.strip_control_chars