Merge branch 'release/2.15.0'

Author: wolph

.travis.yml

@@ -13,16 +13,14 @@ matrix:
       env: TOXENV=docs
     - python: '3.6'
       env: TOXENV=flake8
-    - python: '3.5'
-      env: TOXENV=py35
     - python: '3.6'
       env: TOXENV=py36
       script: tox -vv
     - python: '3.7'
       env: TOXENV=py37
     - python: '3.8'
       env: TOXENV=py38
-    - python: '3.9-dev'
+    - python: '3.9'
       env: TOXENV=py39
   # Added power support architecture
     - arch: ppc64le
@@ -32,8 +30,6 @@ matrix:
       python: '3.6'
       env: TOXENV=flake8
     - arch: ppc64le
-      python: '3.5'
-      env: TOXENV=py35
     - arch: ppc64le
       python: '3.6'
       env: TOXENV=py36
@@ -44,7 +40,7 @@ matrix:
       python: '3.8'
       env: TOXENV=py38
     - arch: ppc64le
-      python: '3.9-dev'
+      python: '3.9'
       env: TOXENV=py39
 
 cache:

stl/__about__.py

@@ -1,6 +1,6 @@
 __package_name__ = 'numpy-stl'
 __import_name__ = 'stl'
-__version__ = '2.14.2'
+__version__ = '2.15.0'
 __author__ = 'Rick van Hattem'
 __author_email__ = '[email protected]'
 __description__ = ' '.join('''

stl/stl.py

@@ -136,13 +136,18 @@ def _load_binary(cls, fh, header, check_size=False):
 
     @classmethod
     def _ascii_reader(cls, fh, header):
-        if b'\n' in header:
-            recoverable = [True]
+        recoverable = [True]
+        line_separator = b'\n'
+
+        if b'\r\n' in header:
+            line_separator = b'\r\n'
+        elif b'\n' in header:
+            pass
         else:
             recoverable = [False]
             header += b(fh.read(BUFFER_SIZE))
 
-        lines = b(header).split(b('\n'))
+        lines = b(header).split(line_separator)
 
         def get(prefix=''):
             prefix = b(prefix).lower()
@@ -156,7 +161,7 @@ def get(prefix=''):
                 recoverable[0] = False
 
                 # Read more lines and make sure we prepend any old data
-                lines[:] = b(fh.read(BUFFER_SIZE)).split(b('\n'))
+                lines[:] = b(fh.read(BUFFER_SIZE)).split(line_separator)
                 raw_line += lines.pop(0)
 
             raw_line = raw_line.strip()