From 699582f06caffc0bd021d8f7450070d2dcc25f37 Mon Sep 17 00:00:00 2001
From: Jesse Mapel <jmapel@usgs.gov>
Date: Tue, 6 Apr 2021 09:32:33 -0700
Subject: [PATCH] Fixed pre-parse try except (#414)
* Fixed pre-parse try except
* Fixed comparison warnings
---
ale/drivers/__init__.py | 17 ++++++++++-------
ale/transformation.py | 8 ++++----
2 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/ale/drivers/__init__.py b/ale/drivers/__init__.py
index 1a8f9b1..15eb9d7 100644
--- a/ale/drivers/__init__.py
+++ b/ale/drivers/__init__.py
@@ -98,16 +98,19 @@ def load(label, props={}, formatter='ale', verbose=False):
try:
# Try default grammar for pds3 label
parsed_label = parse_label(label)
- except ValueError as e:
- if verbose:
- print(e)
- # If pds3 label fails, try isis grammar
- parsed_label = parse_label(label, pvl.grammar.ISISGrammar())
except Exception as e:
if verbose:
+ print("First parse attempt failed with")
print(e)
- # If both fail, then don't parse the label, and just pass the driver a file.
- parsed_label = None
+ # If pds3 label fails, try isis grammar
+ try:
+ parsed_label = parse_label(label, pvl.grammar.ISISGrammar())
+ except Exception as e:
+ if verbose:
+ print("Second parse attempt failed with")
+ print(e)
+ # If both fail, then don't parse the label, and just pass the driver a file.
+ parsed_label = None
if verbose:
if parsed_label:
diff --git a/ale/transformation.py b/ale/transformation.py
index 80935f3..fc3ff7b 100644
--- a/ale/transformation.py
+++ b/ale/transformation.py
@@ -154,23 +154,23 @@ class FrameChain(nx.DiGraph):
print(e)
break
- if frame_type is 1 or frame_type is 2:
+ if frame_type == 1 or frame_type == 2:
frame_code = 1
- elif frame_type is 3:
+ elif frame_type == 3:
try:
matrix, frame_code = spice.ckfrot(frame_type_id, ephemeris_time)
except:
raise Exception(f"The ck rotation from frame {frame_codes[-1]} can not \
be found due to no pointing available at requested time \
or a problem with the frame")
- elif frame_type is 4:
+ elif frame_type == 4:
try:
matrix, frame_code = spice.tkfram(frame_type_id)
except:
raise Exception(f"The tk rotation from frame {frame_codes[-1]} can not \
be found")
- elif frame_type is 5:
+ elif frame_type == 5:
matrix, frame_code = spice.zzdynrot(frame_type_id, center, ephemeris_time)
else:
--
GitLab