From a71b0b84d1c5dfdac7505b0de644d11dd771d00e Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 28 Oct 2019 11:01:04 -0400 Subject: [PATCH 1/3] Wrapped dictionary .values() call in list --- src/diffpy/srfit/fitbase/fitrecipe.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffpy/srfit/fitbase/fitrecipe.py b/src/diffpy/srfit/fitbase/fitrecipe.py index 8ed636e4..c367f78b 100644 --- a/src/diffpy/srfit/fitbase/fitrecipe.py +++ b/src/diffpy/srfit/fitbase/fitrecipe.py @@ -179,7 +179,7 @@ def addContribution(self, con, weight = 1.0): def setWeight(self, con, weight): """Set the weight of a FitContribution.""" - idx = self._contributions.values().index(con) + idx = list(self._contributions.values()).index(con) self._weights[idx] = weight return From 4bccef83e7fefe5c9c35ee753ef84c62b78872b2 Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 28 Oct 2019 11:10:10 -0400 Subject: [PATCH 2/3] Wrapped dictionary .keys() call in list --- src/diffpy/srfit/fitbase/fitresults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffpy/srfit/fitbase/fitresults.py b/src/diffpy/srfit/fitbase/fitresults.py index d6508fb8..6cde340d 100644 --- a/src/diffpy/srfit/fitbase/fitresults.py +++ b/src/diffpy/srfit/fitbase/fitresults.py @@ -349,7 +349,7 @@ def formatResults(self, header = "", footer = "", update = False): ## Per-FitContribution results if len(self.conresults) > 1: - keys = self.conresults.keys() + keys = list(self.conresults.keys()) keys.sort(key=numstr) lines.append("") From 564c9e30ba94ad6c65c53abaee13712a7cc736e4 Mon Sep 17 00:00:00 2001 From: Pavol Juhas Date: Thu, 14 Nov 2019 02:46:35 -0500 Subject: [PATCH 3/3] TST: adjust for fixup in diffpy.structure Test passes with diffpy.structure 3.0.1. --- src/diffpy/srfit/tests/testpdf.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/diffpy/srfit/tests/testpdf.py b/src/diffpy/srfit/tests/testpdf.py index 43c7266b..426b7d81 100644 --- a/src/diffpy/srfit/tests/testpdf.py +++ b/src/diffpy/srfit/tests/testpdf.py @@ -270,11 +270,6 @@ def test_pickling(self): self.assertTrue(numpy.array_equal(res1, pc2.residual())) return - # TODO: remove after fixup release of diffpy.structure - import sys - if sys.version_info >= (3, 7): - test_pickling = unittest.expectedFailure(test_pickling) - # End of class TestPDFContribution # ----------------------------------------------------------------------------