From 69fc08f6f3d7e3112463e18da83e6445d36c2572 Mon Sep 17 00:00:00 2001
From: Manuel Ebert <manuel@1450.me>
Date: Wed, 17 Aug 2016 13:41:54 +0000
Subject: [PATCH] Upgrade to cryptography 1.4

---
 jrnl/EncryptedJournal.py | 4 ++--
 setup.py                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jrnl/EncryptedJournal.py b/jrnl/EncryptedJournal.py
index ae37769d..a29db554 100644
--- a/jrnl/EncryptedJournal.py
+++ b/jrnl/EncryptedJournal.py
@@ -57,8 +57,8 @@ class EncryptedJournal(Journal.Journal):
     @classmethod
     def _create(cls, filename, password):
         key = make_key(password)
-        dummy = Fernet(key).encrypt("")
-        with open(filename, 'w') as f:
+        dummy = Fernet(key).encrypt(b"")
+        with open(filename, 'wb') as f:
             f.write(dummy)
 
 
diff --git a/setup.py b/setup.py
index 0adcab15..e96973be 100644
--- a/setup.py
+++ b/setup.py
@@ -86,7 +86,7 @@ setup(
         "cryptography==1.4",
         "tzlocal>=1.2",
         "pyyaml>=3.11",
-        "keyring==7.3",
+        "keyring>=7.3",
         "passlib>=1.6.2",
         "pyxdg>=0.25",
     ] + [p for p, cond in conditional_dependencies.items() if cond],