Skip to content

Wrapped dictionary .values() call in list #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 14, 2019
Merged

Wrapped dictionary .values() call in list #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a71b0b8
Wrapped dictionary .values() call in list
Oct 28, 2019
4bccef8
Wrapped dictionary .keys() call in list
Oct 28, 2019
564c9e3
TST: adjust for fixup in diffpy.structure
pavoljuhas Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/diffpy/srfit/fitbase/fitrecipe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/diffpy/srfit/fitbase/fitresults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("")
Expand Down
5 changes: 0 additions & 5 deletions src/diffpy/srfit/tests/testpdf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

# ----------------------------------------------------------------------------
Expand Down