Fix linting, use new query syntax

src/privatim/cli/__init__.py

@@ -1,9 +1,5 @@
-import os
 import click
 from privatim.cli.add_user import add_user
-from privatim.utils import first
-
-
 
 
 @click.group()
@@ -14,7 +10,5 @@ def cli() -> None:
 cli.add_command(add_user)
 
 
-
-
 if __name__ == '__main__':
     cli()

src/privatim/cli/add_user.py

@@ -1,6 +1,7 @@
 import click
 from pyramid.paster import bootstrap
 from pyramid.paster import get_appsettings
+from sqlalchemy import select
 
 from privatim.models import User
 from privatim.orm import get_engine, Base
@@ -20,7 +21,8 @@ def add_user(config_uri: str, email: str, password: str) -> None:
     with env['request'].tm:
         dbsession = env['request'].dbsession
 
-        existing_user = dbsession.query(User).filter(User.email == email).first()
+        query = select(User).filter(User.email == email)
+        existing_user = dbsession.execute(query).scalar_one_or_none()
         if existing_user:
             click.echo(f"User with email {email} already exists.")
             return

src/privatim/cli/find_files.py

@@ -1,7 +1,6 @@
 from typing import TYPE_CHECKING
 import os
 import click
-from privatim.utils import first
 
 if TYPE_CHECKING:
     from typing import Iterator
@@ -67,4 +66,3 @@ def find_ini_file_or_abort() -> str:
 
     click.echo('No suitable .ini file found. Aborting.')
     click.get_current_context().abort()
-

tests/cli/test_cli.py

@@ -1,4 +1,3 @@
-import os
 from privatim.cli.find_files import find_ini_files
 from tests.shared.fixtures import temporary_directory
 from pathlib import Path
@@ -21,4 +20,3 @@ def test_find_ini_files(temporary_directory):
     assert file__.exists()
     file = next(find_ini_files(str(file__)))
     assert 'development.ini' in file
-