diff --git a/scripts/glibc_check.py b/scripts/glibc_check.py index eb198ed56..44fd25cd1 100755 --- a/scripts/glibc_check.py +++ b/scripts/glibc_check.py @@ -34,7 +34,7 @@ def main(): try: output = subprocess.check_output(objdump % filename, shell=True, stderr=subprocess.STDOUT) - output = output.decode('utf-8') + output = output.decode() versions = set(parse_version(match.group(1)) for match in glibc_re.finditer(output)) requires_glibc = max(versions) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index e7111c2a4..517d0499a 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -1843,7 +1843,7 @@ class Archiver: if wanted.startswith('hex:'): wanted = unhexlify(wanted[4:]) elif wanted.startswith('str:'): - wanted = wanted[4:].encode('utf-8') + wanted = wanted[4:].encode() else: raise ValueError('unsupported search term') except (ValueError, UnicodeEncodeError): diff --git a/src/borg/helpers/manifest.py b/src/borg/helpers/manifest.py index eb88c0389..a238d6557 100644 --- a/src/borg/helpers/manifest.py +++ b/src/borg/helpers/manifest.py @@ -54,7 +54,7 @@ class Archives(abc.MutableMapping): values = self._archives.get(_name) if values is None: raise KeyError - ts = parse_timestamp(values[b'time'].decode('utf-8')) + ts = parse_timestamp(values[b'time'].decode()) return ArchiveInfo(name=name, id=values[b'id'], ts=ts) def __setitem__(self, name, info): diff --git a/src/borg/remote.py b/src/borg/remote.py index f8db4cec0..42f133c68 100644 --- a/src/borg/remote.py +++ b/src/borg/remote.py @@ -848,7 +848,7 @@ This problem will go away as soon as the server has been upgraded to 1.0.7+. self.stderr_received = lines.pop() # now we have complete lines in and any partial line in self.stderr_received. for line in lines: - handle_remote_line(line.decode('utf-8')) # decode late, avoid partial utf-8 sequences + handle_remote_line(line.decode()) # decode late, avoid partial utf-8 sequences if w: while not self.to_send and (calls or self.preload_ids) and len(waiting_for) < MAX_INFLIGHT: if calls: