Skip to content

Fixes for Python 3.7 #7617

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
mhvk merged 7 commits into from
Jul 2, 2018
Merged

Fixes for Python 3.7 #7617

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2d61303
Fix deprecation warning when importing the ABCs from 'collections'
saimn Jul 2, 2018
75e39a8
Duplicate ignored warnings for Python 3.7
saimn Jul 2, 2018
204aa73
Remove use of inspect.formatargspec which is deprecated
saimn Jul 2, 2018
a6e2c15
Setting __dir__ with a list is no more allowed
saimn Jul 2, 2018
8eee26b
Ignore collections.abc warnings for lxml
saimn Jul 2, 2018
e35668b
Fix floating point error in FITS time test
saimn Jul 2, 2018
dd353b1
Update comment about getargspec deprecation [ci skip]
saimn Jul 2, 2018
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
6 changes: 3 additions & 3 deletions astropy/io/ascii/misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"""


import collections
import collections.abc

@bsipocz bsipocz Jul 11, 2018 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can't have this for the 2.0.x backport. I'll remove this change from the backport, but anyway, expect that it won't cause any roubles given the last commit of the PR.

@saimn saimn Jul 11, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the warning is filtered for lxml, so should be fine.

import itertools
import operator

Expand Down Expand Up @@ -95,10 +95,10 @@ def sortmore(*args, **kw):
if globalkey is None:
globalkey = lambda *x: 0

if not isinstance(globalkey, collections.Callable):
if not isinstance(globalkey, collections.abc.Callable):
raise ValueError('globalkey needs to be callable')

if isinstance(key, collections.Callable):
if isinstance(key, collections.abc.Callable):
k = lambda x: (globalkey(*x), key(x[0]))
elif isinstance(key, tuple):
key = (k if k else lambda x: 0 for k in key)
Expand Down