chore: update sqlalchemy exception imports (#12919)

* chore: update sqlalchemy exception imports

Changed in 1.4, and a proxy import was left in place.
Update references to quiet down IDE warnings and use the current
location.

Refs: sqlalchemy/sqlalchemy@aded39f#diff-2772b7fba8928afe87d08ebadd2f805fdce83b3ffc638ed705cbedc7fd67ce41

Signed-off-by: Mike Fiedler <[email protected]>

* lint: sort imports

Signed-off-by: Mike Fiedler <[email protected]>

---------

Signed-off-by: Mike Fiedler <[email protected]>

Author: miketheman

tests/unit/accounts/test_views.py

@@ -25,7 +25,7 @@
     HTTPSeeOther,
     HTTPTooManyRequests,
 )
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 from webauthn.authentication.verify_authentication_response import (
     VerifiedAuthentication,
 )

tests/unit/admin/views/test_banners.py

@@ -16,7 +16,7 @@
 import pytest
 
 from pyramid.httpexceptions import HTTPNotFound
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 from webob.multidict import MultiDict
 
 from warehouse.admin.views import banners as views

tests/unit/admin/views/test_sponsors.py

@@ -20,7 +20,7 @@
 import pytest
 
 from pyramid.httpexceptions import HTTPNotFound
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 from webob.multidict import MultiDict
 
 from warehouse.admin.interfaces import ISponsorLogoStorage

tests/unit/email/test_init.py

@@ -16,7 +16,7 @@
 import pretend
 import pytest
 
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 from warehouse import email
 from warehouse.accounts.interfaces import IUserService

tests/unit/manage/test_views.py

@@ -26,8 +26,8 @@
     HTTPTooManyRequests,
 )
 from pyramid.response import Response
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import joinedload
-from sqlalchemy.orm.exc import NoResultFound
 from webauthn.helpers import bytes_to_base64url
 from webob.multidict import MultiDict
 

warehouse/accounts/models.py

@@ -33,8 +33,8 @@
     sql,
 )
 from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy.ext.hybrid import hybrid_property
-from sqlalchemy.orm.exc import NoResultFound
 
 from warehouse import db
 from warehouse.events.models import HasEvents

warehouse/accounts/services.py

@@ -23,8 +23,8 @@
 import requests
 
 from passlib.context import CryptContext
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import joinedload
-from sqlalchemy.orm.exc import NoResultFound
 from sqlalchemy.sql import exists
 from webauthn.helpers import bytes_to_base64url
 from zope.interface import implementer

warehouse/accounts/views.py

@@ -26,7 +26,7 @@
 )
 from pyramid.security import forget, remember
 from pyramid.view import view_config, view_defaults
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 from webauthn.helpers import bytes_to_base64url
 
 from warehouse.accounts import REDIRECT_FIELD_NAME

warehouse/admin/views/banners.py

@@ -14,7 +14,7 @@
 
 from pyramid.httpexceptions import HTTPNotFound, HTTPSeeOther
 from pyramid.view import view_config
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 from warehouse.banners.models import Banner
 from warehouse.forms import Form, URIValidator

warehouse/admin/views/checks.py

@@ -12,7 +12,7 @@
 
 from pyramid.httpexceptions import HTTPNotFound, HTTPSeeOther
 from pyramid.view import view_config
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 from warehouse.malware.models import MalwareCheck, MalwareCheckState, MalwareCheckType
 from warehouse.malware.tasks import backfill, remove_verdicts, run_scheduled_check