From 77f188b92f5d6bda3ef17dee008053d7a7d17657 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 11 May 2012 12:46:28 +0200 Subject: [PATCH] trimmed dependencies to plxrn --- sfa/importer/__init__.py | 1 - sfa/managers/registry_manager.py | 1 - sfa/managers/registry_manager_openstack.py | 1 - sfa/rspecs/elements/versions/pgv2Link.py | 1 - sfa/rspecs/elements/versions/pgv2Node.py | 2 +- sfa/rspecs/elements/versions/sfav1Node.py | 2 +- sfa/rspecs/versions/pgv2.py | 1 - sfa/rspecs/versions/sfav1.py | 1 - 8 files changed, 2 insertions(+), 8 deletions(-) diff --git a/sfa/importer/__init__.py b/sfa/importer/__init__.py index 9fc4e2b0..0e33ef78 100644 --- a/sfa/importer/__init__.py +++ b/sfa/importer/__init__.py @@ -3,7 +3,6 @@ import sys from sfa.util.xrn import get_authority, hrn_to_urn -from sfa.util.plxrn import email_to_hrn from sfa.generic import Generic from sfa.util.config import Config from sfa.util.sfalogging import _SfaLogger diff --git a/sfa/managers/registry_manager.py b/sfa/managers/registry_manager.py index 78aecfda..12aea4eb 100644 --- a/sfa/managers/registry_manager.py +++ b/sfa/managers/registry_manager.py @@ -9,7 +9,6 @@ from sfa.util.faults import RecordNotFound, AccountNotEnabled, PermissionError, from sfa.util.sfatime import utcparse, datetime_to_epoch from sfa.util.prefixTree import prefixTree from sfa.util.xrn import Xrn, get_authority, hrn_to_urn, urn_to_hrn -from sfa.util.plxrn import hrn_to_pl_login_base from sfa.util.version import version_core from sfa.util.sfalogging import logger diff --git a/sfa/managers/registry_manager_openstack.py b/sfa/managers/registry_manager_openstack.py index b5c10fae..cc3ff108 100644 --- a/sfa/managers/registry_manager_openstack.py +++ b/sfa/managers/registry_manager_openstack.py @@ -9,7 +9,6 @@ from sfa.util.faults import RecordNotFound, AccountNotEnabled, PermissionError, from sfa.util.sfatime import utcparse, datetime_to_epoch from sfa.util.prefixTree import prefixTree from sfa.util.xrn import Xrn, get_authority, hrn_to_urn, urn_to_hrn -from sfa.util.plxrn import hrn_to_pl_login_base from sfa.util.version import version_core from sfa.util.sfalogging import logger diff --git a/sfa/rspecs/elements/versions/pgv2Link.py b/sfa/rspecs/elements/versions/pgv2Link.py index 5e0a8282..1c0d3ce1 100644 --- a/sfa/rspecs/elements/versions/pgv2Link.py +++ b/sfa/rspecs/elements/versions/pgv2Link.py @@ -1,4 +1,3 @@ -from sfa.util.plxrn import PlXrn from sfa.util.xrn import Xrn from sfa.rspecs.elements.element import Element from sfa.rspecs.elements.link import Link diff --git a/sfa/rspecs/elements/versions/pgv2Node.py b/sfa/rspecs/elements/versions/pgv2Node.py index cae644dc..99276831 100644 --- a/sfa/rspecs/elements/versions/pgv2Node.py +++ b/sfa/rspecs/elements/versions/pgv2Node.py @@ -1,4 +1,4 @@ -from sfa.util.plxrn import PlXrn, xrn_to_hostname +from sfa.util.plxrn import xrn_to_hostname from sfa.util.xrn import Xrn from sfa.util.xml import XpathFilter from sfa.rspecs.elements.node import Node diff --git a/sfa/rspecs/elements/versions/sfav1Node.py b/sfa/rspecs/elements/versions/sfav1Node.py index f50e6877..fefc9a15 100644 --- a/sfa/rspecs/elements/versions/sfav1Node.py +++ b/sfa/rspecs/elements/versions/sfav1Node.py @@ -1,6 +1,6 @@ from sfa.util.sfalogging import logger from sfa.util.xml import XpathFilter -from sfa.util.plxrn import PlXrn, xrn_to_hostname +from sfa.util.plxrn import xrn_to_hostname from sfa.util.xrn import Xrn from sfa.rspecs.elements.element import Element from sfa.rspecs.elements.node import Node diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py index 3565d4e6..9ac4d37c 100644 --- a/sfa/rspecs/versions/pgv2.py +++ b/sfa/rspecs/versions/pgv2.py @@ -1,7 +1,6 @@ from copy import deepcopy from StringIO import StringIO from sfa.util.xrn import Xrn, urn_to_sliver_id -from sfa.util.plxrn import hostname_to_urn, xrn_to_hostname from sfa.rspecs.version import RSpecVersion from sfa.rspecs.elements.versions.pgv2Link import PGv2Link from sfa.rspecs.elements.versions.pgv2Node import PGv2Node diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index 6400489b..964da059 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -3,7 +3,6 @@ from lxml import etree from sfa.util.sfalogging import logger from sfa.util.xrn import hrn_to_urn, urn_to_hrn -from sfa.util.plxrn import PlXrn from sfa.rspecs.version import RSpecVersion from sfa.rspecs.elements.element import Element from sfa.rspecs.elements.versions.pgv2Link import PGv2Link -- 2.43.0