some more cleanup of unused code

Author: bsipocz

astroquery/lamda/core.py

@@ -250,10 +250,7 @@ def write_lamda_datafile(filename, tables):
     coll_part_hdr = re.sub('^ +', '', coll_part_hdr, flags=re.MULTILINE)
 
     if platform.system() == 'Windows':
-        if sys.version_info[0] >= 3:
-            stream = open(filename, 'w', newline='')
-        else:
-            stream = open(filename, 'wb')
+        stream = open(filename, 'w', newline='')
     else:
         stream = open(filename, 'w')
 

astroquery/mast/tests/test_mast.py

@@ -1,6 +1,5 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-
 import os
 import re
 
@@ -10,8 +9,6 @@
 from astropy.tests.helper import pytest
 from astropy.coordinates import SkyCoord
 from astropy.io import fits
-from astropy.tests.helper import catch_warnings
-from astropy.utils.exceptions import AstropyDeprecationWarning
 
 import astropy.units as u
 

astroquery/splatalogue/core.py

@@ -7,7 +7,6 @@
 :author: Adam Ginsburg <[email protected]>
 """
 import warnings
-import sys
 from astropy.io import ascii
 from astropy import units as u
 from astroquery import log
@@ -22,10 +21,6 @@
 # example query of SPLATALOGUE directly:
 # https://www.cv.nrao.edu/php/splat/c.php?sid%5B%5D=64&sid%5B%5D=108&calcIn=&data_version=v3.0&from=&to=&frequency_units=MHz&energy_range_from=&energy_range_to=&lill=on&tran=&submit=Search&no_atmospheric=no_atmospheric&no_potential=no_potential&no_probable=no_probable&include_only_nrao=include_only_nrao&displayLovas=displayLovas&displaySLAIM=displaySLAIM&displayJPL=displayJPL&displayCDMS=displayCDMS&displayToyaMA=displayToyaMA&displayOSU=displayOSU&displayRecomb=displayRecomb&displayLisa=displayLisa&displayRFI=displayRFI&ls1=ls1&ls5=ls5&el1=el1
 
-if sys.version_info.major == 2:
-    # can't do unicode doctests in py2
-    __doctest_skip__ = ['SplatalogueClass.get_species_ids']
-
 
 @async_to_sync
 class SplatalogueClass(BaseQuery):

astroquery/template_module/tests/test_module.py

@@ -1,6 +1,5 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 
-
 # astroquery uses the pytest framework for testing
 # this is already available in astropy and does
 # not require a separate install. Import it using:
@@ -14,9 +13,7 @@
 
 # Now import other commonly used modules for tests
 import os
-import requests
 
-from numpy import testing as npt
 from astropy.table import Table
 import astropy.coordinates as coord
 import astropy.units as u