stackforge/swiftsync
Code Issues Proposed changes

hacking.py compliant.

Browse Source
This commit is contained in:
Chmouel Boudjnah 2013-04-08 10:02:20 +02:00
parent 4f66c0cf04
commit dee72cbf69
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swsync/accounts.py
View File

@ -14,16 +14,16 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import time
import datetime import datetime
import logging import logging
import time
import swiftclient
import dateutil.relativedelta import dateutil.relativedelta
import keystoneclient.v2_0.client import keystoneclient.v2_0.client
import swiftclient
from utils import get_config
import swsync.containers import swsync.containers
from utils import get_config
class Accounts(object): class Accounts(object):
@ -33,7 +33,7 @@ class Accounts(object):
self.container_cls = swsync.containers.Containers() self.container_cls = swsync.containers.Containers()
def get_swift_auth(self, auth_url, tenant, user, password): def get_swift_auth(self, auth_url, tenant, user, password):
"""Get swift connexion from args""" """Get swift connexion from args."""
return swiftclient.client.Connection( return swiftclient.client.Connection(
auth_url, auth_url,
'%s:%s' % (tenant, user), '%s:%s' % (tenant, user),
@ -41,7 +41,7 @@ class Accounts(object):
auth_version=2).get_auth() auth_version=2).get_auth()
def get_ks_auth_orig(self): def get_ks_auth_orig(self):
"""Get keystone cnx from config""" """Get keystone cnx from config."""
orig_auth_url = get_config('auth', 'keystone_origin') orig_auth_url = get_config('auth', 'keystone_origin')
cfg = get_config('auth', 'keystone_origin_admin_credentials') cfg = get_config('auth', 'keystone_origin_admin_credentials')
(tenant_name, username, password) = cfg.split(':') (tenant_name, username, password) = cfg.split(':')