[PR #4007/7f1e3ac2 backport][3.28] Fix the import path for pulp-hashlib

CHANGES/plugin_api/4006.bugfix

@@ -0,0 +1 @@
+Fixed the import path for ``pulpcore.plugin.pulp_hashlib``.

pulpcore/app/models/__init__.py

@@ -1,23 +1,23 @@
 # https://docs.djangoproject.com/en/3.2/topics/db/models/#organizing-models-in-a-package
 
 # Must be imported first as other models depend on it
-from .base import (  # noqa
+from .base import (
     BaseModel,
     MasterModel,
     pulp_uuid,
 )
 
-from .access_policy import (  # noqa
+from .access_policy import (
     AccessPolicy,
     AutoAddObjPermsMixin,
     Group,
 )
 
-from .domain import Domain  # noqa
+from .domain import Domain
 
-from .acs import AlternateContentSource, AlternateContentSourcePath  # noqa
+from .acs import AlternateContentSource, AlternateContentSourcePath
 
-from .content import (  # noqa
+from .content import (
     Artifact,
     AsciiArmoredDetachedSigningService,
     Content,
@@ -29,9 +29,9 @@
     UnsupportedDigestValidationError,
 )
 
-from .generic import GenericRelationModel  # noqa
+from .generic import GenericRelationModel
 
-from .exporter import (  # noqa
+from .exporter import (
     Export,
     ExportedResource,
     Exporter,
@@ -41,14 +41,14 @@
     PulpExporter,
 )
 
-from .importer import (  # noqa
+from .importer import (
     Import,
     Importer,
     PulpImport,
     PulpImporter,
 )
 
-from .publication import (  # noqa
+from .publication import (
     ContentGuard,
     Distribution,
     Publication,
@@ -59,41 +59,33 @@
     ArtifactDistribution,
 )
 
-from .repository import (  # noqa
+from .repository import (
     Remote,
     Repository,
     RepositoryContent,
     RepositoryVersion,
     RepositoryVersionContentDetails,
 )
 
-# This can lead to circular imports with a custom user model depending on this very module
-# Moved to plugin/models/role.py to avoid the circular import.
-# from .role import (  # noqa
-#     GroupRole,
-#     Role,
-#     UserRole,
-# )
+from .status import ContentAppStatus
 
-from .status import ContentAppStatus  # noqa
-
-from .task import (  # noqa
+from .task import (
     CreatedResource,
     Task,
     TaskGroup,
     TaskSchedule,
     Worker,
 )
 
-from .analytics import SystemID  # noqa
+from .analytics import SystemID
 
-from .upload import (  # noqa
+from .upload import (
     Upload,
     UploadChunk,
 )
 
 # Moved here to avoid a circular import with Task
-from .progress import GroupProgressReport, ProgressReport  # noqa
+from .progress import GroupProgressReport, ProgressReport
 
 # Moved here to avoid a circular import with GroupProgressReport
-from .replica import UpstreamPulp  # noqa
+from .replica import UpstreamPulp

pulpcore/app/serializers/__init__.py

@@ -2,7 +2,7 @@
 # - fields can import directly from base if needed
 # - all can import directly from base and fields if needed
 
-from .base import (  # noqa
+from .base import (
     AsyncOperationResponseSerializer,
     DetailIdentityField,
     DetailRelatedField,
@@ -19,7 +19,7 @@
     validate_unknown_fields,
     HiddenFieldsMixin,
 )
-from .fields import (  # noqa
+from .fields import (
     BaseURLField,
     ExportsIdentityFromExporterField,
     ExportRelatedField,
@@ -36,29 +36,29 @@
     TaskGroupStatusCountField,
     pulp_labels_validator,
 )
-from .access_policy import AccessPolicySerializer  # noqa
-from .acs import (  # noqa
+from .access_policy import AccessPolicySerializer
+from .acs import (
     AlternateContentSourcePathSerializer,
     AlternateContentSourceSerializer,
 )
-from .content import (  # noqa
+from .content import (
     ArtifactSerializer,
     ContentChecksumSerializer,
     MultipleArtifactContentSerializer,
     NoArtifactContentSerializer,
     SigningServiceSerializer,
     SingleArtifactContentSerializer,
 )
-from .domain import DomainSerializer  # noqa
-from .exporter import (  # noqa
+from .domain import DomainSerializer
+from .exporter import (
     ExporterSerializer,
     ExportSerializer,
     FilesystemExportSerializer,
     FilesystemExporterSerializer,
     PulpExporterSerializer,
     PulpExportSerializer,
 )
-from .importer import (  # noqa
+from .importer import (
     EvaluationSerializer,
     ImporterSerializer,
     ImportSerializer,
@@ -67,9 +67,9 @@
     PulpImporterSerializer,
     PulpImportSerializer,
 )
-from .orphans import OrphansCleanupSerializer  # noqa
-from .progress import GroupProgressReportSerializer, ProgressReportSerializer  # noqa
-from .publication import (  # noqa
+from .orphans import OrphansCleanupSerializer
+from .progress import GroupProgressReportSerializer, ProgressReportSerializer
+from .publication import (
     ContentGuardSerializer,
     DistributionSerializer,
     PublicationSerializer,
@@ -78,31 +78,31 @@
     ContentRedirectContentGuardSerializer,
     ArtifactDistributionSerializer,
 )
-from .purge import PurgeSerializer  # noqa
-from .repository import (  # noqa
+from .purge import PurgeSerializer
+from .repository import (
     RemoteSerializer,
     RepositorySerializer,
     RepositorySyncURLSerializer,
     RepositoryAddRemoveContentSerializer,
     RepositoryVersionSerializer,
 )
-from .repair import RepairSerializer  # noqa
-from .reclaim import ReclaimSpaceSerializer  # noqa
-from .task import (  # noqa
+from .repair import RepairSerializer
+from .reclaim import ReclaimSpaceSerializer
+from .task import (
     MinimalTaskSerializer,
     TaskCancelSerializer,
     TaskScheduleSerializer,
     TaskSerializer,
     TaskGroupSerializer,
     WorkerSerializer,
 )
-from .upload import (  # noqa
+from .upload import (
     UploadChunkSerializer,
     UploadCommitSerializer,
     UploadSerializer,
     UploadDetailSerializer,
 )
-from .user import (  # noqa
+from .user import (
     GroupRoleSerializer,
     GroupSerializer,
     GroupUserSerializer,
@@ -111,4 +111,4 @@
     UserRoleSerializer,
     UserSerializer,
 )
-from .replica import UpstreamPulpSerializer  # noqa
+from .replica import UpstreamPulpSerializer

pulpcore/app/serializers/purge.py

@@ -3,7 +3,7 @@
 
 from rest_framework import serializers
 
-from pulpcore.app.serializers import ValidateFieldsMixin  # noqa
+from pulpcore.app.serializers import ValidateFieldsMixin
 from pulpcore.constants import TASK_FINAL_STATES
 
 

pulpcore/app/tasks/__init__.py

@@ -1,25 +1,25 @@
-from pulpcore.app.tasks import base, repository, upload  # noqa
+from pulpcore.app.tasks import base, repository, upload
 
-from .base import (  # noqa
+from .base import (
     general_create,
     general_create_from_temp_file,
     general_delete,
     general_multi_delete,
     general_update,
 )
 
-from .export import fs_publication_export, fs_repo_version_export  # noqa
+from .export import fs_publication_export, fs_repo_version_export
 
-from .importer import pulp_import  # noqa
+from .importer import pulp_import
 
-from .orphan import orphan_cleanup  # noqa
+from .orphan import orphan_cleanup
 
-from .purge import purge  # noqa
+from .purge import purge
 
-from .reclaim_space import reclaim_space  # noqa
+from .reclaim_space import reclaim_space
 
-from .replica import replicate_distributions  # noqa
+from .replica import replicate_distributions
 
-from .repository import repair_all_artifacts  # noqa
+from .repository import repair_all_artifacts
 
-from .analytics import post_analytics  # noqa
+from .analytics import post_analytics

pulpcore/app/views/__init__.py

@@ -1,4 +1,4 @@
-from .orphans import OrphansView  # noqa
-from .status import StatusView  # noqa
-from .repair import RepairView  # noqa
-from .importer import PulpImporterImportCheckView  # noqa
+from .orphans import OrphansView
+from .status import StatusView
+from .repair import RepairView
+from .importer import PulpImporterImportCheckView

pulpcore/app/viewsets/__init__.py

@@ -1,4 +1,4 @@
-from .base import (  # noqa
+from .base import (
     AsyncCreateMixin,
     AsyncRemoveMixin,
     AsyncUpdateMixin,
@@ -8,11 +8,11 @@
     NULLABLE_NUMERIC_FILTER_OPTIONS,
 )
 
-from .access_policy import AccessPolicyViewSet  # noqa
+from .access_policy import AccessPolicyViewSet
 
-from .acs import AlternateContentSourceViewSet  # noqa
+from .acs import AlternateContentSourceViewSet
 
-from .content import (  # noqa
+from .content import (
     ArtifactFilter,
     ArtifactViewSet,
     ContentFilter,
@@ -21,27 +21,27 @@
     ReadOnlyContentViewSet,
     SigningServiceViewSet,
 )
-from .custom_filters import (  # noqa
+from .custom_filters import (
     RepoVersionHrefFilter,
     RepositoryVersionFilter,
 )
-from .domain import DomainViewSet  # noqa
-from .exporter import (  # noqa
+from .domain import DomainViewSet
+from .exporter import (
     ExportViewSet,
     ExporterViewSet,
     FilesystemExporterViewSet,
     FilesystemExportViewSet,
     PulpExporterViewSet,
     PulpExportViewSet,
 )
-from .importer import (  # noqa
+from .importer import (
     ImportViewSet,
     ImporterViewSet,
     PulpImportViewSet,
     PulpImporterViewSet,
 )
-from .orphans import OrphansCleanupViewset  # noqa
-from .publication import (  # noqa
+from .orphans import OrphansCleanupViewset
+from .publication import (
     ContentGuardFilter,
     ContentGuardViewSet,
     DistributionFilter,
@@ -55,8 +55,8 @@
     ContentRedirectContentGuardViewSet,
     ArtifactDistributionViewSet,
 )
-from .reclaim import ReclaimSpaceViewSet  # noqa
-from .repository import (  # noqa
+from .reclaim import ReclaimSpaceViewSet
+from .repository import (
     ImmutableRepositoryViewSet,
     ListRepositoryViewSet,
     ReadOnlyRepositoryViewSet,
@@ -67,14 +67,14 @@
     RepositoryVersionViewSet,
     ListRepositoryVersionViewSet,
 )
-from .task import TaskViewSet, TaskGroupViewSet, TaskScheduleViewSet, WorkerViewSet  # noqa
-from .upload import UploadViewSet  # noqa
-from .user import (  # noqa
+from .task import TaskViewSet, TaskGroupViewSet, TaskScheduleViewSet, WorkerViewSet
+from .upload import UploadViewSet
+from .user import (
     GroupViewSet,
     GroupRoleViewSet,
     GroupUserViewSet,
     RoleViewSet,
     UserViewSet,
     UserRoleViewSet,
 )
-from .replica import UpstreamPulpViewSet  # noqa
+from .replica import UpstreamPulpViewSet

pulpcore/cache/__init__.py

@@ -1,4 +1,4 @@
-from .cache import (  # noqa
+from .cache import (
     AsyncCache,
     AsyncContentCache,
     Cache,

pulpcore/download/__init__.py

@@ -1,4 +1,4 @@
-from .base import BaseDownloader, DownloadResult  # noqa
-from .factory import DownloaderFactory  # noqa
-from .file import FileDownloader  # noqa
-from .http import HttpDownloader  # noqa
+from .base import BaseDownloader, DownloadResult
+from .factory import DownloaderFactory
+from .file import FileDownloader
+from .http import HttpDownloader

pulpcore/exceptions/__init__.py

@@ -1,11 +1,11 @@
-from .base import (  # noqa
+from .base import (
     AdvisoryLockError,
     PulpException,
     ResourceImmutableError,
     TimeoutException,
     exception_to_dict,
 )
-from .validation import (  # noqa
+from .validation import (
     DigestValidationError,
     InvalidSignatureError,
     SizeValidationError,

pulpcore/plugin/__init__.py

@@ -1,2 +1,2 @@
 # plugins declare that they are a pulp plugin by subclassing PulpPluginAppConfig
-from pulpcore.app.apps import PulpPluginAppConfig  # noqa
+from pulpcore.app.apps import PulpPluginAppConfig

pulpcore/plugin/access_policy.py

@@ -1 +1 @@
-from pulpcore.app.access_policy import AccessPolicyFromDB  # noqa
+from pulpcore.app.access_policy import AccessPolicyFromDB  # noqa: F401

pulpcore/plugin/apps.py

@@ -1 +1 @@
-from pulpcore.app.apps import adjust_roles  # noqa
+from pulpcore.app.apps import adjust_roles  # noqa: F401