Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix circular import issue. (PP-1016) #1699

Merged
merged 2 commits into from
Feb 27, 2024
Merged

Fix circular import issue. (PP-1016) #1699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3142779
Fix circular import issue.
tdilauro Feb 27, 2024
7f13e20
Fix some circular imports in library modules.
tdilauro Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions api/saml/metadata/federations/loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@
from onelogin.saml2.idp_metadata_parser import OneLogin_Saml2_IdPMetadataParser
from onelogin.saml2.xmlparser import tostring

from api.saml.metadata.federations.model import (
SAMLFederatedIdentityProvider,
SAMLFederation,
)
from api.saml.metadata.federations.validator import SAMLFederatedMetadataValidator
from api.saml.metadata.parser import SAMLMetadataParser
from core.exceptions import BasePalaceException
from core.model import SAMLFederatedIdentityProvider, SAMLFederation
from core.util import first_or_default


Expand Down
2 changes: 1 addition & 1 deletion api/saml/metadata/federations/validator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
from onelogin.saml2.utils import OneLogin_Saml2_Utils
from onelogin.saml2.xmlparser import fromstring

from api.saml.metadata.federations.model import SAMLFederation
from core.exceptions import BasePalaceException
from core.model import SAMLFederation
from core.util.datetime_helpers import from_timestamp, utc_now


Expand Down
3 changes: 1 addition & 2 deletions bin/configuration/add_saml_federations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
sys.path.append(os.path.abspath(package_dir))

from api.saml.metadata.federations import incommon
from api.saml.metadata.federations.model import SAMLFederation
from core.model import production_session
from core.model import SAMLFederation, production_session

with closing(production_session()) as db:
incommon_federation = (
Expand Down