Skip to content
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.

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

MNT: last of the python2 cleanups #2392

Merged
merged 5 commits into from
May 5, 2022
Merged

Conversation

bsipocz
Copy link
Member

@bsipocz bsipocz commented May 5, 2022

This is to close #1870

bsipocz added 3 commits May 4, 2022 20:20
Using this darling: gsed -i -e 's|\(.*super(\)\(.*)\.\)\(.*)\)|\1).\3|g'
@codecov
Copy link

codecov bot commented May 5, 2022

Codecov Report

Merging #2392 (9d5a6a6) into main (96f63eb) will not change coverage.
The diff coverage is 79.06%.

@@           Coverage Diff           @@
##             main    #2392   +/-   ##
=======================================
  Coverage   62.87%   62.87%           
=======================================
  Files         133      133           
  Lines       17246    17246           
=======================================
  Hits        10844    10844           
  Misses       6402     6402           
Impacted Files Coverage Δ
astroquery/image_cutouts/first/core.py 92.68% <0.00%> (ø)
astroquery/magpis/core.py 93.61% <0.00%> (ø)
astroquery/ogle/core.py 88.09% <0.00%> (ø)
astroquery/utils/download_file_list.py 28.12% <0.00%> (ø)
astroquery/utils/progressbar.py 20.45% <0.00%> (ø)
astroquery/vo_conesearch/conesearch.py 30.12% <0.00%> (ø)
astroquery/vo_conesearch/validator/validate.py 16.88% <ø> (ø)
astroquery/nasa_ads/core.py 82.89% <50.00%> (ø)
astroquery/utils/commons.py 78.39% <66.66%> (ø)
astroquery/alma/core.py 42.80% <100.00%> (ø)
... and 26 more

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

@@ -3,7 +3,7 @@
__all__ = ['DummyHandler']


class DummyHandler(object):
class DummyHandler():
Copy link
Member

Choose a reason for hiding this comment

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

The following would be equivalent, but shorter:

Suggested change
class DummyHandler():
class DummyHandler:

Copy link
Member Author

Choose a reason for hiding this comment

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

oh, sure. Thanks!

@@ -114,7 +114,7 @@ def from_cache(self, cache_location):
response = pickle.load(f)
if not isinstance(response, requests.Response):
response = None
except IOError: # TODO: change to FileNotFoundError once drop py2 support
except OSError: # TODO: change to FileNotFoundError once drop py2 support
Copy link
Member

Choose a reason for hiding this comment

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

The comment here suggests using a more specific subclass of OSError, it might be a good idea to do the same elsewhere too.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hah, sed doesn't read the comments :)

@bsipocz
Copy link
Member Author

bsipocz commented May 5, 2022

I'm addressing the URL sanitizing issue separately in #2394

@bsipocz bsipocz merged commit 7f32904 into astropy:main May 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cleanup python2
2 participants