Fix stripping of CRLF on Windows.

anntzer · Kojoley · commit 022934882b8e · 2018-10-02T19:29:00.000+03:00
diff --git a/lib/matplotlib/dviread.py b/lib/matplotlib/dviread.py
@@ -1025,14 +1025,14 @@ def find_tex_file(filename, format=None):
     if format is not None:
         cmd += ['--format=' + format]
     cmd += [filename]
-    try:  # Below: strip final newline.
-        result = cbook._check_and_log_subprocess(cmd, _log, **kwargs)[:-1]
+    try:
+        result = cbook._check_and_log_subprocess(cmd, _log, **kwargs)
     except RuntimeError:
         return ''
     if os.name == 'nt':
-        return result.decode('utf-8')
+        return result.decode('utf-8').rstrip('\r\n')
     else:
-        return os.fsdecode(result)
+        return os.fsdecode(result).rstrip('\n')
 
 
 @lru_cache()
