Survex3D encoding and version tests

.gitattributes

@@ -0,0 +1,9 @@
+# https://help.github.com/articles/dealing-with-line-endings/
+
+*       text=auto eol=lf
+*.py    text
+*.svg   text
+*.th2   text
+
+*.svx   text
+*.3d    binary

extensions/survex.py

@@ -253,7 +253,7 @@ def __init__(self, filename=None, flags_leg_exclude=0):
         self.flags_leg_exclude = flags_leg_exclude
         if filename is None:
             pass
-        elif isinstance(filename, basestring):
+        elif isinstance(filename, basestring) or hasattr(filename, "__fspath__"):
             self.load(filename)
         else:
             # assume iterable with stations

tests/data/make-3d.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+for enc in latin1 utf8; do
+    for v in 3 4 5 6 7 8; do
+        out="3d/umlaut-$enc-v$v.3d"
+        if [[ ! -f "$out" ]]; then
+            cavern -v $v -o "$out" umlaut-$enc.svx
+        fi
+    done
+done

tests/data/umlaut-latin1.svx

@@ -0,0 +1,5 @@
+*title "H�hle mit Umlaut"
+
+*data normal from to length clino compass
+1 2 1.2 +0 000
+2 3 3.4 +0 090

tests/data/umlaut-utf8.svx

@@ -0,0 +1,5 @@
+*title "Höhle mit Umlaut"
+
+*data normal from to length clino compass
+1 2 1.2 +0 000
+2 3 3.4 +0 090

tests/test_survex.py

@@ -0,0 +1,13 @@
+import survex as m
+
+from pathlib import Path
+
+TESTS_DATA = Path(__file__).resolve().parent / "data"
+
+
+def test_Survex3D_umlaut():
+    for path3d in (TESTS_DATA / "3d").glob("umlaut-*.3d"):
+        s = m.Survex3D(path3d)
+        assert s.length() == 460.0
+        assert list(s.sortedlabels()) == ["1", "2", "3"]
+        assert s.title == "Höhle mit Umlaut"