remove unnecessary try...else

Author: aaxelb

share/models/index_backfill.py

@@ -185,5 +185,4 @@ def task__schedule_index_backfill(self, index_backfill_pk):
     except Exception as error:
         _index_backfill.pls_mark_error(error)
         raise error
-    else:
-        _index_backfill.pls_note_scheduling_has_finished()
+    _index_backfill.pls_note_scheduling_has_finished()

trove/derive/osfmap_json.py

@@ -151,8 +151,7 @@ def _list_or_single_value(self, predicate_iri: str, json_list: list[JsonValue])
                 (_only_obj,) = json_list
             except ValueError:
                 return None
-            else:
-                return _only_obj
+            return _only_obj
         return (
             sorted(json_list, key=json.dumps)
             if len(json_list) > 1

trove/render/cardsearch_atom.py

@@ -73,5 +73,4 @@ def _atom_id(self, card_iri: str) -> str:
             _uuid = rdf.iri_minus_namespace(card_iri, namespace=trove_indexcard_namespace())
         except ValueError:
             return card_iri
-        else:
-            return f'urn:uuid:{_uuid}'
+        return f'urn:uuid:{_uuid}'

trove/render/jsonld.py

@@ -157,8 +157,7 @@ def _list_or_single_value(self, predicate_iri: str, objectlist: list[JsonValue])
                 (_only_obj,) = objectlist
             except ValueError:
                 return None
-            else:
-                return _only_obj
+            return _only_obj
         if predicate_iri in _PREDICATES_OF_FLEXIBLE_CARDINALITY and len(objectlist) == 1:
             return objectlist[0]
         return sorted(objectlist, key=_naive_sort_key)

trove/trovesearch/trovesearch_gathering.py

@@ -497,8 +497,7 @@ def _osfmap_or_unknown_iri_as_json(iri: str) -> rdf.Literal:
         _twopledict = osfmap.OSFMAP_THESAURUS[iri]
     except KeyError:
         return rdf.literal_json({'@id': iri})
-    else:
-        return _osfmap_json({iri: _twopledict}, focus_iri=iri)
+    return _osfmap_json({iri: _twopledict}, focus_iri=iri)
 
 
 def _valuesearch_result_as_json(result: ValuesearchResult) -> rdf.Literal:

trove/util/queryparams.py

@@ -113,8 +113,7 @@ def get_single_value(
         (_singlevalue,) = _paramvalues
     except ValueError:
         raise trove_exceptions.InvalidRepeatedQueryParam(str(queryparam_name))
-    else:
-        return _singlevalue
+    return _singlevalue
 
 
 def get_bool_value(

trove/util/trove_params.py

@@ -72,8 +72,7 @@ def _gather_shorthand(cls, queryparams: _qp.QueryparamDict) -> rdf.IriShorthand:
                 (_shortname,) = _qp_name.bracketed_names
             except ValueError:
                 raise trove_exceptions.InvalidQueryParamName(_qp_name)
-            else:
-                _prefixmap[_shortname] = _iri
+            _prefixmap[_shortname] = _iri
         _shorthand = cls._default_shorthand()
         if _prefixmap:
             _shorthand = _shorthand.with_update(_prefixmap)

trove/views/ingest.py

@@ -61,9 +61,8 @@ def post(self, request: HttpRequest) -> HttpResponse:
         except trove_exceptions.DigestiveError as e:
             logger.exception(str(e))
             return http.HttpResponse(str(e), status=HTTPStatus.BAD_REQUEST)
-        else:
-            # TODO: include (link to?) extracted card(s)
-            return http.HttpResponse(status=HTTPStatus.CREATED)
+        # TODO: include (link to?) extracted card(s)
+        return http.HttpResponse(status=HTTPStatus.CREATED)
 
     def delete(self, request: HttpRequest) -> HttpResponse:
         # TODO: cleaner permissions