Merge pull request #2365 from midichef/xport_v2

[sas-] make XptSheet rows be list instead of tuple
saulpw · May 24, 2024 · a9980b3 · a9980b3
2 parents d5ca442 + fdb0509
commit a9980b3
Show file tree

Hide file tree

Showing 5 changed files with 135 additions and 2 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -18,7 +18,7 @@ mapbox-vector-tile # mbtiles
 pypng # png
 fonttools # ttf/otf
 sas7bdat # sas7bdat (SAS)
-xport  # xpt (SAS)
+xport==2.0.2 # xpt (SAS)
 PyYAML>=5.1 # yaml/yml
 dpkt # pcap
 dnslib # pcap

diff --git a/sample_data/brakes.xpt b/sample_data/brakes.xpt
diff --git a/tests/golden/load-xpt.tsv b/tests/golden/load-xpt.tsv
@@ -0,0 +1,129 @@
+MACHINE BRAKE
+1.00 322.00
+1.00 322.00
+1.00 322.02
+1.00 321.99
+1.00 322.01
+1.00 322.00
+1.00 322.01
+1.00 321.98
+1.00 322.00
+1.00 322.00
+1.00 321.98
+1.00 321.98
+1.00 322.00
+1.00 322.00
+1.00 322.00
+1.00 322.00
+2.00 322.01
+2.00 322.03
+2.00 322.01
+2.00 322.03
+2.00 322.01
+2.00 322.03
+2.00 322.02
+2.00 322.01
+2.00 322.02
+2.00 321.99
+2.00 322.02
+2.00 322.02
+2.00 322.02
+2.00 322.01
+2.00 322.01
+2.00 322.00
+3.00 321.99
+3.00 321.99
+3.00 322.00
+3.00 321.98
+3.00 322.02
+3.00 321.98
+3.00 322.00
+3.00 322.00
+3.00 322.00
+3.00 322.02
+3.00 322.00
+3.00 322.01
+3.00 321.99
+3.00 321.99
+3.00 321.99
+3.00 322.00
+4.00 321.99
+4.00 322.00
+4.00 322.01
+4.00 322.00
+4.00 321.99
+4.00 322.00
+4.00 322.00
+4.00 321.99
+4.00 322.00
+4.00 322.00
+4.00 321.99
+4.00 322.00
+4.00 321.99
+4.00 321.99
+4.00 321.98
+4.00 322.00
+5.00 321.99
+5.00 322.00
+5.00 322.00
+5.00 322.01
+5.00 322.02
+5.00 321.99
+5.00 322.01
+5.00 322.02
+5.00 322.00
+5.00 322.01
+5.00 322.01
+5.00 322.00
+5.00 322.00
+5.00 321.99
+5.00 322.01
+5.00 322.00
+6.00 322.00
+6.00 321.98
+6.00 322.00
+6.00 322.00
+6.00 322.02
+6.00 322.00
+6.00 322.01
+6.00 322.01
+6.00 322.00
+6.00 322.01
+6.00 322.00
+6.00 322.01
+6.00 322.01
+6.00 322.00
+6.00 322.00
+6.00 322.00
+7.00 322.01
+7.00 322.02
+7.00 322.01
+7.00 322.00
+7.00 322.01
+7.00 322.02
+7.00 322.01
+7.00 322.00
+7.00 322.00
+7.00 322.01
+7.00 322.00
+7.00 321.99
+7.00 322.01
+7.00 322.01
+7.00 322.00
+7.00 322.01
+8.00 321.99
+8.00 321.99
+8.00 321.99
+8.00 322.01
+8.00 321.99
+8.00 322.00
+8.00 322.00
+8.00 322.00
+8.00 322.00
+8.00 322.00
+8.00 321.99
+8.00 322.00
+8.00 322.00
+8.00 321.98
+8.00 321.99
+8.00 322.00
diff --git a/tests/load-xpt.vdj b/tests/load-xpt.vdj
@@ -0,0 +1,2 @@
+#!vd -p
+{"sheet": null, "col": null, "row": null, "longname": "open-file", "input": "sample_data/brakes.xpt", "keystrokes": "o", "comment": null}
diff --git a/visidata/loaders/sas.py b/visidata/loaders/sas.py
@@ -25,7 +25,9 @@ def iterload(self):
  for i, var in enumerate(self.rdr._variables):
  self.addColumn(ColumnItem(var.name, i, type=float if var.numeric else str))
 
- yield from self.rdr
+ # a visidata row must not be a tuple, so convert each tuple to a list
+ for t in self.rdr:
+ yield list(t)
 
 
 class SasSheet(Sheet):