Back port pvl label decoding.

wtolson · Oct 30, 2015 · ccee0fd · ccee0fd
1 parent b827bb0
commit ccee0fd
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 1,875 deletions.
diff --git a/pysis/cubefile.py b/pysis/cubefile.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 import numpy
-from six import string_types
+import pvl
 
+from six import string_types
 from six.moves import range
 
-from .labels import load as load_label
 from .specialpixels import SPECIAL_PIXELS
 
 
@@ -230,7 +230,7 @@ def size(self):
         return self.bands * self.lines * self.samples
 
     def _parse_label(self, stream):
-        return load_label(stream)
+        return pvl.load(stream)
 
     def _parse_data(self, stream):
         stream.seek(self.start_byte)

diff --git a/pysis/labels/__init__.py b/pysis/labels/__init__.py
diff --git a/pysis/labels/_collections.py b/pysis/labels/_collections.py