Skip to content

Pvl loads fix #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
antonhibl wants to merge 21 commits into from
Closed

Pvl loads fix #587

Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0100f16
initial UVVIS Driver notebook and code commit
antonhibl Feb 6, 2023
8395baa
build fixes
antonhibl Feb 6, 2023
fb4e3b7
Merge branch 'USGS-Astrogeology:master' into master
antonhibl Feb 24, 2023
62eba85
Merge branch 'DOI-USGS:main' into master
antonhibl May 30, 2023
17f2726
Merge branch 'DOI-USGS:main' into master
antonhibl Jun 14, 2023
6222813
adding initial draft of the driver verification script
antonhibl Nov 7, 2023
4a70a49
Merge branch 'DOI-USGS:main' into spice-verification
antonhibl Nov 7, 2023
cb85d6d
script changes
antonhibl Dec 6, 2023
ac033a3
Merge branch 'DOI-USGS:main' into spice-verification
antonhibl Dec 6, 2023
b0fddd3
removing uvvis stuff that somehow got dragged in
antonhibl Dec 6, 2023
3944614
debugging isd_generate portion
antonhibl Dec 14, 2023
afe6a08
updated driver verification script
antonhibl Jan 8, 2024
9b487e2
Merge branch 'DOI-USGS:main' into spice-verification
antonhibl Jan 8, 2024
4d1b1f7
adding ale.load(s) to test ISD generation
antonhibl Jan 10, 2024
7f3a6ed
Merge remote-tracking branch 'origin/spice-verification' into spice-v…
antonhibl Jan 10, 2024
ac7aae3
Merge branch 'DOI-USGS:main' into pvl-loads-fix
antonhibl Jan 11, 2024
902aa08
fixed PVLModule loading with ale.load(s)
antonhibl Jan 11, 2024
67c51dc
removed conflicting driver verification script file, moving changes f…
antonhibl Jan 11, 2024
cb9e6e5
accidentally removed 2 lines
antonhibl Jan 11, 2024
cac3c9d
removing extra spaces
antonhibl Jan 11, 2024
6bb46f4
removed unneccesary AttributeError exception handler
antonhibl Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions ale/base/label_isis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ def label(self):
self._label = self._file
grammar = pvl.grammar.ISISGrammar()
grammar.comments+=(("#", "\n"), )
try:
self._label = pvl.loads(self._file, grammar=grammar)
except Exception:
self._label = pvl.load(self._file, grammar=grammar)
except:
raise ValueError("{} is not a valid label".format(self._file))
if not isinstance(self._file, pvl.PVLModule):
try:
self._label = pvl.loads(self._file, grammar=grammar)
except Exception:
self._label = pvl.load(self._file, grammar=grammar)
except:
raise ValueError("{} is not a valid label".format(self._file))
return self._label

@property
Expand Down