Merge branch 'py2_py3_fixes' into '1.5.x'

Py2/Py3 fixes

See merge request !11

beat/backend/python/hash.py

@@ -44,12 +44,12 @@ def _sha256(s):
     """A python2/3 shortcut for :py:func:`haslib.sha256.hexdigest` to will
     ensure that the given string is unicode before going further.
     """
-    try:
-        if isinstance(s, six.string_types):
-            s = six.u(s)
-    except:
-        pass
-    return hashlib.sha256(s.encode('utf-8')).hexdigest()
+    if isinstance(s, six.string_types):
+        try:
+            s = six.u(s).encode('utf-8')
+        except:
+            s = s.encode('utf-8')
+    return hashlib.sha256(s).hexdigest()
 
 
 #----------------------------------------------------------

beat/backend/python/utils.py

@@ -190,6 +190,15 @@ class File(object):
             self.backup()
 
         mode = 'wb' if self.binary else 'wt'
+        if self.binary:
+            mode = 'wb'
+            if isinstance(contents, six.string_types):
+                contents = contents.encode('utf-8')
+        else:
+            mode = 'wt'
+            if not isinstance(contents, six.string_types):
+                contents = contents.decode('utf-8')
+
         with open(self.path, mode) as f:
             f.write(contents)