Using defs instead of assingning lambda expressions, also removing try/except workaround as we don't support that old astropy versions any more

Author: bsipocz

astroquery/utils/class_or_instance.py

@@ -20,10 +20,11 @@ def __init__(self, fn):
             self.__doc__ = ""
 
     def __get__(self, obj, cls):
-        if obj is not None:
-            f = lambda *args, **kwds: self.fn(obj, *args, **kwds)
-        else:
-            f = lambda *args, **kwds: self.fn(cls, *args, **kwds)
+        def f(*args, **kwds):
+            if obj is not None:
+                return self.fn(obj, *args, **kwds)
+            else:
+                return self.fn(cls, *args, **kwds)
         functools.update_wrapper(f, self.fn)
         return f
 

astroquery/utils/commons.py

@@ -19,32 +19,31 @@
 import astropy.utils.data as aud
 from astropy.io import fits, votable
 
-try:
-    from astropy.coordinates import BaseCoordinateFrame
-    ICRSCoordGenerator = lambda *args, **kwargs: coord.SkyCoord(
-        *args, frame='icrs', **kwargs)
-    GalacticCoordGenerator = lambda *args, **kwargs: coord.SkyCoord(
-        *args, frame='galactic', **kwargs)
-    FK5CoordGenerator = lambda *args, **kwargs: coord.SkyCoord(
-        *args, frame='fk5', **kwargs)
-    FK4CoordGenerator = lambda *args, **kwargs: coord.SkyCoord(
-        *args, frame='fk4', **kwargs)
-    ICRSCoord = coord.SkyCoord
-    CoordClasses = (coord.SkyCoord, BaseCoordinateFrame)
-except ImportError:
-    from astropy.coordinates import SphericalCoordinatesBase as BaseCoordinateFrame
-    ICRSCoordGenerator = lambda *args, **kwargs: coord.ICRS(*args, **kwargs)
-    GalacticCoordGenerator = lambda *args, **kwargs: coord.Galactic(
-        *args, **kwargs)
-    FK5CoordGenerator = lambda *args, **kwargs: coord.FK5(*args, **kwargs)
-    FK4CoordGenerator = lambda *args, **kwargs: coord.FK4(*args, **kwargs)
-    ICRSCoord = coord.ICRS
-    CoordClasses = (coord.SphericalCoordinatesBase,)
+from astropy.coordinates import BaseCoordinateFrame
 
 from ..exceptions import TimeoutError
 from .. import version
 
 
+def ICRSCoordGenerator(*args, **kwargs):
+    return coord.SkyCoord(*args, frame='icrs', **kwargs)
+
+
+def GalacticCoordGenerator(*args, **kwargs):
+    return coord.SkyCoord(*args, frame='galactic', **kwargs)
+
+
+def FK5CoordGenerator(*args, **kwargs):
+    return coord.SkyCoord(*args, frame='fk5', **kwargs)
+
+
+def FK4CoordGenerator(*args, **kwargs):
+    return coord.SkyCoord(*args, frame='fk4', **kwargs)
+
+ICRSCoord = coord.SkyCoord
+CoordClasses = (coord.SkyCoord, BaseCoordinateFrame)
+
+
 __all__ = ['send_request',
            'parse_coordinates',
            'parse_radius',

astroquery/vizier/core.py

@@ -82,7 +82,8 @@ def column_filters(self):
 
     @column_filters.setter
     def column_filters(self, values):
-        self._column_filters = VizierClass._schema_column_filters.validate(values)
+        self._column_filters = (
+            VizierClass._schema_column_filters.validate(values))
 
     @property
     def catalog(self):