From 710198878d2e5136243cd5f0109ec8ac36346de7 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Wed, 23 May 2018 22:19:34 -0700
Subject: [PATCH] some fixes for python3 compatibility
---
gwinc/struct.py | 2 +-
gwinc/test/__main__.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gwinc/struct.py b/gwinc/struct.py
index 2bc7ba20..f9bcaef3 100644
--- a/gwinc/struct.py
+++ b/gwinc/struct.py
@@ -166,7 +166,7 @@ class Struct(object):
"""
txt = io.StringIO()
for k, v in sorted(self.walk()):
- if isinstance(v, (int, long, float, complex)):
+ if isinstance(v, (int, float, complex)):
base = fmt
elif isinstance(v, np.ndarray):
v = np.array2string(v, separator='', max_line_width=np.Inf, formatter={'all':lambda x: "{:0.6e} ".format(x)})
diff --git a/gwinc/test/__main__.py b/gwinc/test/__main__.py
index adf700b6..17f87626 100644
--- a/gwinc/test/__main__.py
+++ b/gwinc/test/__main__.py
@@ -63,7 +63,7 @@ def main():
freq = np.logspace(np.log10(FLO), np.log10(FHI), NPOINTS)
mdata_pkl = os.path.join(os.path.dirname(__file__), '{}.pkl'.format(args.IFO))
- ifo_hash = hashlib.sha1(ifo.to_txt()).hexdigest()
+ ifo_hash = hashlib.sha1(ifo.to_txt().encode()).hexdigest()
gwinc_hash = path_hash(os.getenv('GWINCPATH'))
mrecalc = True
--
GitLab