Use ''.splitlines() instead of split('\n')

[htsworkflow.git] / htsworkflow / util / hashfile.py

diff --git a/htsworkflow/util/hashfile.py b/htsworkflow/util/hashfile.py
index 2900e76ae3727f0b2182376f666cda4deaf85bd3..5382865bd8757676d939df1e75f19e5801c3df15 100644 (file)
--- a/htsworkflow/util/hashfile.py
+++ b/htsworkflow/util/hashfile.py
@@ -4,6 +4,8 @@ import logging
 import os
 from subprocess import Popen, PIPE
 
+from django.utils.encoding import smart_text
+
 logger = logging.getLogger(__name__)
 
 def make_md5sum(filename):
@@ -12,7 +14,7 @@ def make_md5sum(filename):
     md5_cache = os.path.join(filename+".md5")
     if os.path.exists(md5_cache):
         logger.debug("Found md5sum in {0}".format(md5_cache))
-        stream = open(md5_cache,'r')
+        stream = open(md5_cache,'rt')
         lines = stream.readlines()
         md5sum = parse_md5sum_line(lines, filename)
     else:
@@ -29,17 +31,19 @@ def make_md5sum_unix(filename, md5_cache):
     if retcode != 0:
         logger.error("Trouble with md5sum for {0}".format(filename))
         return None
-    lines = stdin.split(os.linesep)
+    lines = stdin.splitlines()
     md5sum = parse_md5sum_line(lines, filename)
     if md5sum is not None:
         logger.debug("Caching sum in {0}".format(md5_cache))
-        stream = open(md5_cache, "w")
-        stream.write(stdin)
+        stream = open(md5_cache, "wt")
+        stream.write(smart_text(stdin))
         stream.close()
     return md5sum
 
 def parse_md5sum_line(lines, filename):
-    md5sum, md5sum_filename = lines[0].split()
+    md5sum, md5sum_filename = smart_text(lines[0]).split()
+    md5sum_filename = os.path.basename(md5sum_filename)
+    filename = os.path.basename(filename)
     if md5sum_filename != filename:
         errmsg = "MD5sum and I disagre about filename. {0} != {1}"
         logger.error(errmsg.format(filename, md5sum_filename))