Merge pull request #22 from PressLabs/fix-unicode-hasing-errors

Encode keys before hashing them.

pyolite/models/lists/keys.py

@@ -15,6 +15,9 @@ def append(self, key):
             with open(str(key_path)) as f:
                 key = f.read()
 
+        if not isinstance(key, bytes):
+            key = key.encode('utf-8')
+
         if key in self:
             return
 
@@ -26,14 +29,17 @@ def append(self, key):
         if key_file.exists() and key_file.read_file() == key:
             return
 
-        key_file.write_file(str(key))
+        key_file.write_file(key, mode='wb')
 
         self.user.git.commit(['keydir'],
                              'Added new key for user %s' % self.user.name)
 
         super(ListKeys, self).append(key)
 
     def remove(self, key):
+        if not isinstance(key, bytes):
+            key = key.encode('utf-8')
+
         directory = Path(self.user.path, 'keydir', self.user.name,
                          hashlib.md5(key.strip().split()[1]).hexdigest())
         key_file = Path(directory, "%s.pub" % self.user.name)

setup.py

@@ -6,7 +6,7 @@
             'six==1.6.1', 'spec==0.11.1']
 
 setup(name="pyolite",
-      version='1.5.8',
+      version='1.5.9',
       platforms='any',
       packages=find_packages(),
       include_package_data=True,

tests/lists/test_keys.py

@@ -32,7 +32,7 @@ def test_if_we_commit_after_a_key_append():
     assert mock_file.isfile.call_count == 1
     assert mock_file.mkdir.call_count == 1
 
-    mock_file.write_file.assert_called_once_with('nothing to see here\n')
+    mock_file.write_file.assert_called_once_with(b'nothing to see here\n', mode='wb')
 
 
 def test_list_addition():