From 0736a4e9f6c0c09c25e3d3451be64ba771ae6e7f Mon Sep 17 00:00:00 2001 From: Simon Kuberski Date: Thu, 28 Oct 2021 19:59:32 +0200 Subject: [PATCH] The conventions for the proper placement of binary operators with respect to line breaks seems to have changed from python 3.6.9 to 3.8.12... --- pyerrors/pyerrors.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyerrors/pyerrors.py b/pyerrors/pyerrors.py index 9ce300c5..74340da2 100644 --- a/pyerrors/pyerrors.py +++ b/pyerrors/pyerrors.py @@ -1149,8 +1149,8 @@ def covariance(obs1, obs2, correlation=False, **kwargs): """ for name in sorted(set(obs1.names + obs2.names)): - if ((obs1.shape.get(name) != obs2.shape.get(name)) and (obs1.shape.get(name) is not None) and (obs2.shape.get(name) is not None) or - (1 != len(set([len(idx) for idx in [obs1.idl[name], obs2.idl[name], merge_idx([obs1.idl[name], obs2.idl[name]])]])))): + if ((obs1.shape.get(name) != obs2.shape.get(name)) and (obs1.shape.get(name) is not None) and (obs2.shape.get(name) is not None) + or (1 != len(set([len(idx) for idx in [obs1.idl[name], obs2.idl[name], merge_idx([obs1.idl[name], obs2.idl[name]])]])))): raise Exception('Shapes of ensemble', name, 'do not fit') if not hasattr(obs1, 'e_names') or not hasattr(obs2, 'e_names'): @@ -1328,8 +1328,8 @@ def covariance3(obs1, obs2, correlation=False, **kwargs): """ for name in sorted(set(obs1.names + obs2.names)): - if ((obs1.shape.get(name) != obs2.shape.get(name)) and (obs1.shape.get(name) is not None) and (obs2.shape.get(name) is not None) or - (1 != len(set([len(idx) for idx in [obs1.idl[name], obs2.idl[name], merge_idx([obs1.idl[name], obs2.idl[name]])]])))): + if ((obs1.shape.get(name) != obs2.shape.get(name)) and (obs1.shape.get(name) is not None) and (obs2.shape.get(name) is not None) + or (1 != len(set([len(idx) for idx in [obs1.idl[name], obs2.idl[name], merge_idx([obs1.idl[name], obs2.idl[name]])]])))): raise Exception('Shapes of ensemble', name, 'do not fit') if not hasattr(obs1, 'e_names') or not hasattr(obs2, 'e_names'):