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 <miketheman@gmail.com>

* lint: sort imports

Signed-off-by: Mike Fiedler <miketheman@gmail.com>

---------

Signed-off-by: Mike Fiedler <miketheman@gmail.com>

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

warehouse/admin/views/emails.py

@@ -18,7 +18,7 @@
 from pyramid.httpexceptions import HTTPBadRequest, HTTPNotFound, HTTPSeeOther
 from pyramid.view import view_config
 from sqlalchemy import String, cast, or_
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 from warehouse.accounts.models import User
 from warehouse.email import send_email

warehouse/admin/views/prohibited_project_names.py

@@ -19,7 +19,7 @@
 from pyramid.httpexceptions import HTTPBadRequest, HTTPNotFound, HTTPSeeOther
 from pyramid.view import view_config
 from sqlalchemy import func, literal, or_
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 from warehouse.accounts.models import User
 from warehouse.packaging.models import (

warehouse/admin/views/projects.py

@@ -16,8 +16,8 @@
 from pyramid.httpexceptions import HTTPBadRequest, HTTPMovedPermanently, HTTPSeeOther
 from pyramid.view import view_config
 from sqlalchemy import func, or_
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import joinedload
-from sqlalchemy.orm.exc import NoResultFound
 
 from warehouse.accounts.models import User
 from warehouse.forklift.legacy import MAX_FILESIZE, MAX_PROJECT_SIZE

warehouse/admin/views/sponsors.py

@@ -19,7 +19,7 @@
 from pyramid.httpexceptions import HTTPNotFound, HTTPSeeOther
 from pyramid.view import view_config
 from slugify import slugify
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 from warehouse.admin.interfaces import ISponsorLogoStorage
 from warehouse.forms import Form, URIValidator

warehouse/email/__init__.py

@@ -19,7 +19,7 @@
 
 from celery.schedules import crontab
 from first import first
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 from warehouse import tasks
 from warehouse.accounts.interfaces import ITokenService, IUserService

warehouse/email/ses/views.py

@@ -17,7 +17,7 @@
 from pyramid.httpexceptions import HTTPBadRequest, HTTPServiceUnavailable
 from pyramid.response import Response
 from pyramid.view import view_config
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy.sql import exists
 
 from warehouse.email.ses.models import EmailMessage, EmailStatus, Event, EventTypes

warehouse/events/models.py

@@ -12,9 +12,9 @@
 
 from sqlalchemy import Column, DateTime, ForeignKey, Index, String, orm, sql
 from sqlalchemy.dialects.postgresql import JSONB, UUID
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy.ext.declarative import AbstractConcreteBase, declared_attr
 from sqlalchemy.ext.hybrid import hybrid_property
-from sqlalchemy.orm.exc import NoResultFound
 
 from warehouse import db
 from warehouse.ip_addresses.models import IpAddress

warehouse/forklift/legacy.py

@@ -40,7 +40,7 @@
 from pyramid.response import Response
 from pyramid.view import view_config
 from sqlalchemy import func, orm
-from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
+from sqlalchemy.exc import MultipleResultsFound, NoResultFound
 from trove_classifiers import classifiers, deprecated_classifiers
 
 from warehouse import forms

warehouse/integrations/vulnerabilities/tasks.py

@@ -11,7 +11,7 @@
 # limitations under the License.
 
 from sqlalchemy import func, orm
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 from warehouse import tasks
 from warehouse.integrations import vulnerabilities

warehouse/legacy/api/json.py

@@ -13,8 +13,8 @@
 from packaging.utils import canonicalize_name, canonicalize_version
 from pyramid.httpexceptions import HTTPMovedPermanently, HTTPNotFound
 from pyramid.view import view_config
+from sqlalchemy.exc import MultipleResultsFound, NoResultFound
 from sqlalchemy.orm import Load, contains_eager, joinedload
-from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
 
 from warehouse.cache.http import cache_control
 from warehouse.cache.origin import origin_cache

warehouse/legacy/api/xmlrpc/views.py

@@ -31,7 +31,7 @@
     xmlrpc_method as _xmlrpc_method,
 )
 from sqlalchemy import func, orm, select
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 from warehouse.accounts.models import User
 from warehouse.classifiers.models import Classifier

warehouse/macaroons/services.py

@@ -16,8 +16,8 @@
 import pymacaroons
 
 from pymacaroons.exceptions import MacaroonDeserializationException
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import joinedload
-from sqlalchemy.orm.exc import NoResultFound
 from zope.interface import implementer
 
 from warehouse.macaroons import caveats

warehouse/malware/tasks.py

@@ -12,7 +12,7 @@
 
 import inspect
 
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 import warehouse.malware.checks as checks
 import warehouse.packaging.models as packaging_models

warehouse/manage/views.py

@@ -28,8 +28,8 @@
 from pyramid.response import Response
 from pyramid.view import view_config, view_defaults
 from sqlalchemy import func
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy.orm import Load, joinedload
-from sqlalchemy.orm.exc import NoResultFound
 from webauthn.helpers import bytes_to_base64url
 
 import warehouse.utils.otp as otp

warehouse/organizations/models.py

@@ -29,7 +29,7 @@
     sql,
 )
 from sqlalchemy.dialects.postgresql import UUID
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 from sqlalchemy_utils.types.url import URLType
 
 from warehouse import db

warehouse/organizations/services.py

@@ -13,7 +13,7 @@
 import datetime
 
 from sqlalchemy import func
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 from zope.interface import implementer
 
 from warehouse.accounts.models import User

warehouse/packaging/models.py

@@ -41,12 +41,12 @@
     sql,
 )
 from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.exc import MultipleResultsFound, NoResultFound
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declared_attr  # type: ignore
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import validates
 from sqlalchemy.orm.collections import attribute_mapped_collection
-from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound
 
 from warehouse import db
 from warehouse.accounts.models import User

warehouse/packaging/views.py

@@ -13,7 +13,7 @@
 from natsort import natsorted
 from pyramid.httpexceptions import HTTPMovedPermanently, HTTPNotFound
 from pyramid.view import view_config
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 from warehouse.accounts.models import User
 from warehouse.cache.origin import origin_cache

warehouse/subscriptions/services.py

@@ -17,7 +17,7 @@
 import stripe
 
 from sqlalchemy import or_
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 from zope.interface import implementer
 
 from warehouse.organizations.models import (

warehouse/utils/project.py

@@ -24,7 +24,7 @@
     HTTPSeeOther,
 )
 from sqlalchemy import exists, func
-from sqlalchemy.orm.exc import NoResultFound
+from sqlalchemy.exc import NoResultFound
 
 from warehouse.admin.flags import AdminFlagValue
 from warehouse.events.tags import EventTag