Repository: libcloud Updated Branches: refs/heads/trunk 23d4355a1 -> 266ade557
Update __all__ remove variables which have been moved to a different module. Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/591ffb06 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/591ffb06 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/591ffb06 Branch: refs/heads/trunk Commit: 591ffb06c66459e99dd7d1b51806105a7946f98e Parents: 23d4355 Author: Tomaz Muraus <[email protected]> Authored: Thu Aug 14 13:58:09 2014 +0200 Committer: Tomaz Muraus <[email protected]> Committed: Thu Aug 14 14:22:24 2014 +0200 ---------------------------------------------------------------------- libcloud/common/openstack.py | 11 ++--------- libcloud/test/common/test_openstack_identity.py | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/591ffb06/libcloud/common/openstack.py ---------------------------------------------------------------------- diff --git a/libcloud/common/openstack.py b/libcloud/common/openstack.py index 0a11d44..e44d144 100644 --- a/libcloud/common/openstack.py +++ b/libcloud/common/openstack.py @@ -47,22 +47,15 @@ AUTH_VERSIONS_WITH_EXPIRES = [ '2.0', '2.0_apikey', '2.0_password', + '3.x', '3.x_password' ] -# How many seconds to substract from the auth token expiration time before -# testing if the token is still valid. -# The time is subtracted to account for the HTTP request latency and prevent -# user from getting "InvalidCredsError" if token is about to expire. -AUTH_TOKEN_EXPIRES_GRACE_SECONDS = 5 - __all__ = [ 'OpenStackBaseConnection', 'OpenStackResponse', 'OpenStackException', - 'OpenStackDriverMixin', - - 'AUTH_TOKEN_EXPIRES_GRACE_SECONDS' + 'OpenStackDriverMixin' ] http://git-wip-us.apache.org/repos/asf/libcloud/blob/591ffb06/libcloud/test/common/test_openstack_identity.py ---------------------------------------------------------------------- diff --git a/libcloud/test/common/test_openstack_identity.py b/libcloud/test/common/test_openstack_identity.py index 6057401..20ec116 100644 --- a/libcloud/test/common/test_openstack_identity.py +++ b/libcloud/test/common/test_openstack_identity.py @@ -25,7 +25,7 @@ from mock import Mock from libcloud.utils.py3 import httplib from libcloud.common.openstack import OpenStackBaseConnection -from libcloud.common.openstack import AUTH_TOKEN_EXPIRES_GRACE_SECONDS +from libcloud.common.openstack_identity import AUTH_TOKEN_EXPIRES_GRACE_SECONDS from libcloud.common.openstack_identity import get_class_for_auth_version from libcloud.common.openstack_identity import OpenStackIdentity_2_0_Connection from libcloud.common.openstack_identity import OpenStackServiceCatalog
