Using single line kwargs.get() instead of if/else

Author: bsipocz

astroquery/nrao/core.py

@@ -172,7 +172,8 @@ def _args_to_payload(self, **kwargs):
             EQUINOX=kwargs.get('equinox', 'J2000'),
             CENTER_RA='',
             CENTER_DEC='',
-            SRAD=str(commons.parse_radius(kwargs['radius']).degree) + 'd' if 'radius' in kwargs else "1.0'",
+            SRAD=str(
+                commons.parse_radius(kwargs.get('radius', "1.0m")).deg) + 'd',
             TELESCOPE_CONFIG=kwargs.get('telescope_config', 'all').upper(),
             OBS_BANDS=kwargs.get('obs_band', 'all').upper(),
             SUBARRAY=kwargs.get('subarray', 'all').upper(),
@@ -258,12 +259,13 @@ def _parse_result(self, response, verbose=False):
                                        'name="Telescope:config" '
                                        ' arraysize="*" ', new_content)
 
-        datatype_mapping = {'integer':'long'}
+        datatype_mapping = {'integer': 'long'}
 
         try:
             tf = six.BytesIO(new_content.encode())
-            first_table = votable.parse(tf, pedantic=False,
-                                        datatype_mapping=datatype_mapping).get_first_table()
+            first_table = votable.parse(
+                tf, pedantic=False,
+                datatype_mapping=datatype_mapping).get_first_table()
             try:
                 table = first_table.to_table(use_names_over_ids=True)
             except TypeError:

astroquery/nrao/tests/test_nrao.py

@@ -28,7 +28,6 @@ def parse_coordinates_mock_return(c):
     return mp
 
 
-
 @pytest.fixture
 def patch_post(request):
     mp = request.getfuncargvalue("monkeypatch")

astroquery/ukidss/core.py

@@ -132,15 +132,9 @@ def logged_in(self):
     def _args_to_payload(self, *args, **kwargs):
         request_payload = {}
 
-        if 'database' in kwargs:
-            request_payload['database'] = kwargs['database']
-        else:
-            request_payload['database'] = self.database
+        request_payload['database'] = kwargs.get('database', self.database)
 
-        if 'programme_id' in kwargs:
-            programme_id = kwargs['programme_id']
-        else:
-            programme_id = self.programme_id
+        programme_id = kwargs.get('programme_id', self.programme_id)
 
         request_payload['programmeID'] = verify_programme_id(
             programme_id, query_type=kwargs['query_type'])

astroquery/utils/process_asyncs.py

@@ -21,10 +21,8 @@ def create_method(async_method_name):
 
         @class_or_instance
         def newmethod(self, *args, **kwargs):
-            if 'verbose' in kwargs:
-                verbose = kwargs.pop('verbose')
-            else:
-                verbose = False
+            verbose = kwargs.pop('verbose', False)
+
             response = getattr(self, async_method_name)(*args, **kwargs)
             if kwargs.get('get_query_payload') or kwargs.get('field_help'):
                 return response