From fc326df6001af5cf2f5497a54cacb93c01b67e33 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Tue, 15 Dec 2015 00:26:06 +0100
Subject: [PATCH] a2b_base64 now also accepts ascii-only str objects

---
 borg/key.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/borg/key.py b/borg/key.py
index fbcc9d543..321158d1a 100644
--- a/borg/key.py
+++ b/borg/key.py
@@ -263,7 +263,7 @@ class KeyfileKeyBase(AESKeyBase):
         raise NotImplementedError
 
     def _load(self, key_data, passphrase):
-        cdata = a2b_base64(key_data.encode('ascii'))  # .encode needed for Python 3.[0-2]
+        cdata = a2b_base64(key_data)
         data = self.decrypt_key_file(cdata, passphrase)
         if data:
             key = msgpack.unpackb(data)