Merge pull request #238 from erigler-usgs/issue-236

Fix AlgorithmException string in SqDistAlgorithm

Merge pull request #238 from erigler-usgs/issue-236
811adb91 · Jeremy M Fee · GitHub · 7ea6bbea · 92155022 · 811adb91
Unverified Commit 811adb91 authored 6 years ago by Jeremy M Fee Committed by GitHub 6 years ago
--- a/geomagio/WebServiceUsage.py
+++ b/geomagio/WebServiceUsage.py
@@ -33,7 +33,7 @@ class WebServiceUsage(object):
            ids += "<code>" + obs_id + "</code>"
            if idx != len(observatories) - 1:
                ids += ", "
-            if idx % 9 == 0 and idx is not 0:
+            if idx % 9 == 0 and idx != 0:
                ids += "<br/>"
        usage_body = """
            <!doctype html>

--- a/geomagio/algorithm/SqDistAlgorithm.py
+++ b/geomagio/algorithm/SqDistAlgorithm.py
@@ -221,7 +221,7 @@ class SqDistAlgorithm(Algorithm):
                # state not correct
                raise AlgorithmException(
                        'Inconsistent SQDist algorithm state' +
-                        ' state(%s, %s, %s, %s) <> process(%s, %s, %s, %s)' %
+                        ' process(%s, %s, %s, %s) <> state(%s, %s, %s, %s)' %
                                (trace.stats.station,
                                trace.stats.channel,
                                trace.stats.delta,