X Tutup
Commit 1a003813 authored by Jelle van der Waa's avatar Jelle van der Waa 🚧
Browse files

fix(aurweb): unnecessary generators that can be rewritten as set comprehensions 

It is unnecessary to use set around a generator expression, since there
are equivalent comprehensions for these types. Using a comprehension is
clearer and more idiomatic.
parent 57979bd9

aurweb/packages/requests.py

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ def handle_request( 


    # Build an accept list out of `accept_query`.

    to_accept: list[PackageRequest] = accept_query.all()

    accepted_ids: Set[int] = set(p.ID for p in to_accept)

    accepted_ids: Set[int] = {p.ID for p in to_accept}



    # Build a reject list out of `query` filtered by IDs not found

    # in `to_accept`. That is, unmatched records of the same base

aurweb/packages/search.py

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ class PackageSearch: 
    def _search_by_keywords(self, keywords: Set[str]) -> orm.Query:

        self._join_user()

        self._join_keywords()

        keywords = set(k.lower() for k in keywords)

        keywords = {k.lower() for k in keywords}

        self.query = self.query.filter(PackageKeyword.Keyword.in_(keywords)).group_by(

            models.Package.Name

        )

aurweb/pkgbase/actions.py

+2 −2
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ def pkgbase_delete_instance( 
def _retry_merge(pkgbase: PackageBase, target: PackageBase) -> None:

    # Target votes and notifications sets of user IDs that are

    # looking to be migrated.

    target_votes = set(v.UsersID for v in target.package_votes)

    target_notifs = set(n.UserID for n in target.notifications)

    target_votes = {v.UsersID for v in target.package_votes}

    target_notifs = {n.UserID for n in target.notifications}



    with db.begin():

        # Merge pkgbase's comments.

aurweb/routers/pkgbase.py

+4 −4
Original line number Diff line number Diff line
@@ -105,19 +105,19 @@ async def pkgbase_keywords( 


    # Lowercase all keywords. Our database table is case insensitive,

    # and providing CI duplicates of keywords is erroneous.

    keywords = set(k.lower() for k in keywords.split())

    keywords = {k.lower() for k in keywords.split()}



    # Delete all keywords which are not supplied by the user.

    with db.begin():

        other_keywords = pkgbase.keywords.filter(~PackageKeyword.Keyword.in_(keywords))

        other_keyword_strings = set(kwd.Keyword.lower() for kwd in other_keywords)

        other_keyword_strings = {kwd.Keyword.lower() for kwd in other_keywords}



        existing_keywords = set(

        existing_keywords = {

            kwd.Keyword.lower()

            for kwd in pkgbase.keywords.filter(

                ~PackageKeyword.Keyword.in_(other_keyword_strings)

            )

        )

        }



        db.delete_all(other_keywords)

        new_keywords = keywords.difference(existing_keywords)
X Tutup