From 31d9a9ad6ded49e238e6da081004c9a8792d920b Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 28 Nov 2011 18:51:58 +0100 Subject: [PATCH] reordered imports --- sfa/client/sfi.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py index 9ed3c848..28fe3ffa 100755 --- a/sfa/client/sfi.py +++ b/sfa/client/sfi.py @@ -4,6 +4,7 @@ import sys sys.path.append('.') + import os, os.path import tempfile import socket @@ -13,22 +14,26 @@ import pickle from lxml import etree from StringIO import StringIO from optparse import OptionParser -from sfa.client.client_helper import pg_users_arg, sfa_users_arg -from sfa.util.sfalogging import sfi_logger + from sfa.trust.certificate import Keypair, Certificate from sfa.trust.gid import GID from sfa.trust.credential import Credential from sfa.trust.sfaticket import SfaTicket -from sfa.util.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord -from sfa.rspecs.rspec import RSpec -from sfa.rspecs.rspec_converter import RSpecConverter + +from sfa.util.sfalogging import sfi_logger from sfa.util.xrn import get_leaf, get_authority, hrn_to_urn -import sfa.client.xmlrpcprotocol as xmlrpcprotocol from sfa.util.config import Config from sfa.util.version import version_core from sfa.util.cache import Cache +from sfa.util.record import SfaRecord, UserRecord, SliceRecord, NodeRecord, AuthorityRecord + +from sfa.rspecs.rspec import RSpec +from sfa.rspecs.rspec_converter import RSpecConverter from sfa.rspecs.version_manager import VersionManager +import sfa.client.xmlrpcprotocol as xmlrpcprotocol +from sfa.client.client_helper import pg_users_arg, sfa_users_arg + AGGREGATE_PORT=12346 CM_PORT=12346 -- 2.47.0