Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .moban.d/travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ matrix:
{%block custom_python_versions%}
python:
- &pypy2 pypy2.7-6.0
- 3.8-dev
- 3.7
- 3.6
- 3.5
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ notifications:
email: false
python:
- &pypy2 pypy2.7-6.0
- 3.8-dev
- 3.7
- 3.6
- 3.5
Expand Down
2 changes: 2 additions & 0 deletions moban/hashstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ def get_file_hash(afile):

def get_hash(content):
md5 = hashlib.md5()
if PY2 and content.__class__.__name__ == "unicode":
content = content.encode("utf-8")
md5.update(content)
return md5.digest().decode("latin1")

Expand Down
3 changes: 3 additions & 0 deletions moban/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from moban import constants, exceptions

log = logging.getLogger(__name__)
PY2 = sys.version_info[0] == 2


def merge(left, right):
Expand Down Expand Up @@ -60,6 +61,8 @@ def file_permissions(afile):


def write_file_out(filename, content):
if PY2 and content.__class__.__name__ == "unicode":
content = content.encode("utf-8")
dest_folder = os.path.dirname(filename)
if dest_folder:
mkdir_p(dest_folder)
Expand Down