From c98b0027e7de2549cfa143e8210cd43e55c75708 Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Tue, 26 May 2015 16:29:34 +1000 Subject: [PATCH] Make utils file private The utils file should be considered private to keystoneauth. The positional function is hopefully being moved to debtcollector. Change-Id: I6ded5aaa120bbf7ee8b7c173c3b069eaf682f2c7 --- keystoneauth/{utils.py => _utils.py} | 0 keystoneauth/access.py | 2 +- keystoneauth/adapter.py | 2 +- keystoneauth/auth/cli.py | 2 +- keystoneauth/auth/identity/access.py | 2 +- keystoneauth/auth/identity/base.py | 2 +- keystoneauth/auth/identity/generic/password.py | 2 +- keystoneauth/auth/identity/v2.py | 2 +- keystoneauth/auth/identity/v3/base.py | 2 +- keystoneauth/discover.py | 2 +- keystoneauth/fixture/discovery.py | 2 +- keystoneauth/service_catalog.py | 2 +- keystoneauth/session.py | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename keystoneauth/{utils.py => _utils.py} (100%) diff --git a/keystoneauth/utils.py b/keystoneauth/_utils.py similarity index 100% rename from keystoneauth/utils.py rename to keystoneauth/_utils.py diff --git a/keystoneauth/access.py b/keystoneauth/access.py index 9a75416f..5015d16b 100644 --- a/keystoneauth/access.py +++ b/keystoneauth/access.py @@ -19,9 +19,9 @@ import functools from oslo_utils import timeutils +from keystoneauth import _utils as utils from keystoneauth.i18n import _ from keystoneauth import service_catalog -from keystoneauth import utils # gap, in seconds, to determine whether the given token is about to expire diff --git a/keystoneauth/adapter.py b/keystoneauth/adapter.py index d7d43ea9..da2223cc 100644 --- a/keystoneauth/adapter.py +++ b/keystoneauth/adapter.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from keystoneauth import utils +from keystoneauth import _utils as utils class Adapter(object): diff --git a/keystoneauth/auth/cli.py b/keystoneauth/auth/cli.py index 24241a06..3cab2f0c 100644 --- a/keystoneauth/auth/cli.py +++ b/keystoneauth/auth/cli.py @@ -13,8 +13,8 @@ import argparse import os +from keystoneauth import _utils as utils from keystoneauth.auth import base -from keystoneauth import utils @utils.positional() diff --git a/keystoneauth/auth/identity/access.py b/keystoneauth/auth/identity/access.py index 110c38b3..06e6f1a8 100644 --- a/keystoneauth/auth/identity/access.py +++ b/keystoneauth/auth/identity/access.py @@ -10,8 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. +from keystoneauth import _utils as utils from keystoneauth.auth.identity import base -from keystoneauth import utils class AccessInfoPlugin(base.BaseIdentityPlugin): diff --git a/keystoneauth/auth/identity/base.py b/keystoneauth/auth/identity/base.py index 91b9735a..2c612165 100644 --- a/keystoneauth/auth/identity/base.py +++ b/keystoneauth/auth/identity/base.py @@ -16,11 +16,11 @@ import logging from oslo_config import cfg import six +from keystoneauth import _utils as utils from keystoneauth.auth import base from keystoneauth import discover from keystoneauth import exceptions from keystoneauth.i18n import _LW -from keystoneauth import utils LOG = logging.getLogger(__name__) diff --git a/keystoneauth/auth/identity/generic/password.py b/keystoneauth/auth/identity/generic/password.py index 1caa7547..026916b6 100644 --- a/keystoneauth/auth/identity/generic/password.py +++ b/keystoneauth/auth/identity/generic/password.py @@ -14,11 +14,11 @@ import logging from oslo_config import cfg +from keystoneauth import _utils as utils from keystoneauth.auth.identity.generic import base from keystoneauth.auth.identity import v2 from keystoneauth.auth.identity import v3 from keystoneauth import discover -from keystoneauth import utils LOG = logging.getLogger(__name__) diff --git a/keystoneauth/auth/identity/v2.py b/keystoneauth/auth/identity/v2.py index 70e09b5b..764498e9 100644 --- a/keystoneauth/auth/identity/v2.py +++ b/keystoneauth/auth/identity/v2.py @@ -16,10 +16,10 @@ import logging from oslo_config import cfg import six +from keystoneauth import _utils as utils from keystoneauth import access from keystoneauth.auth.identity import base from keystoneauth import exceptions -from keystoneauth import utils _logger = logging.getLogger(__name__) diff --git a/keystoneauth/auth/identity/v3/base.py b/keystoneauth/auth/identity/v3/base.py index 1a85bc7f..b15072d1 100644 --- a/keystoneauth/auth/identity/v3/base.py +++ b/keystoneauth/auth/identity/v3/base.py @@ -16,11 +16,11 @@ import logging from oslo_config import cfg import six +from keystoneauth import _utils as utils from keystoneauth import access from keystoneauth.auth.identity import base from keystoneauth import exceptions from keystoneauth.i18n import _ -from keystoneauth import utils _logger = logging.getLogger(__name__) diff --git a/keystoneauth/discover.py b/keystoneauth/discover.py index a8083404..ee2e72ae 100644 --- a/keystoneauth/discover.py +++ b/keystoneauth/discover.py @@ -24,9 +24,9 @@ raw data specified in version discovery responses. import logging import re +from keystoneauth import _utils as utils from keystoneauth import exceptions from keystoneauth.i18n import _, _LI, _LW -from keystoneauth import utils _LOGGER = logging.getLogger(__name__) diff --git a/keystoneauth/fixture/discovery.py b/keystoneauth/fixture/discovery.py index 5040c2d3..9b153be5 100644 --- a/keystoneauth/fixture/discovery.py +++ b/keystoneauth/fixture/discovery.py @@ -14,7 +14,7 @@ import datetime from oslo_utils import timeutils -from keystoneauth import utils +from keystoneauth import _utils as utils __all__ = ['DiscoveryList', 'V2Discovery', diff --git a/keystoneauth/service_catalog.py b/keystoneauth/service_catalog.py index f0dbd096..dd7acfdb 100644 --- a/keystoneauth/service_catalog.py +++ b/keystoneauth/service_catalog.py @@ -20,9 +20,9 @@ import abc import six +from keystoneauth import _utils as utils from keystoneauth import exceptions from keystoneauth.i18n import _ -from keystoneauth import utils @six.add_metaclass(abc.ABCMeta) diff --git a/keystoneauth/session.py b/keystoneauth/session.py index 0052abff..2b2de0fb 100644 --- a/keystoneauth/session.py +++ b/keystoneauth/session.py @@ -27,9 +27,9 @@ import requests import six from six.moves import urllib +from keystoneauth import _utils as utils from keystoneauth import exceptions from keystoneauth.i18n import _, _LI, _LW -from keystoneauth import utils try: import netaddr