openstack
/
glance
Code Issues Proposed changes

Merge "Clean up pep8 E125 violations"

This commit is contained in:
Jenkins 2012-09-25 18:00:23 +00:00 committed by Gerrit Code Review
parent 1257da9b53 5443a0989a
commit 4279c65d12
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glance/registry/client.py
View File

@ -49,18 +49,18 @@ class RegistryClient(BaseClient):
**kwargs)
def decrypt_metadata(self, image_metadata):
if (self.metadata_encryption_key is not None
and 'location' in image_metadata.keys()
and image_metadata['location'] is not None):
if (self.metadata_encryption_key is not None and
'location' in image_metadata.keys() and
image_metadata['location'] is not None):
location = crypt.urlsafe_decrypt(self.metadata_encryption_key,
image_metadata['location'])
image_metadata['location'] = location
return image_metadata
def encrypt_metadata(self, image_metadata):
if (self.metadata_encryption_key is not None
and 'location' in image_metadata.keys()
and image_metadata['location'] is not None):
if (self.metadata_encryption_key is not None and
'location' in image_metadata.keys() and
image_metadata['location'] is not None):
location = crypt.urlsafe_encrypt(self.metadata_encryption_key,
image_metadata['location'], 64)
image_metadata['location'] = location

3
glance/tests/unit/test_migrations.py
View File

@ -202,8 +202,7 @@ class TestMigrations(utils.BaseTestCase):
# Now walk it back down to 0 from the latest, testing
# the downgrade paths.
for version in reversed(
xrange(0, TestMigrations.REPOSITORY.latest)):
for version in reversed(xrange(0, TestMigrations.REPOSITORY.latest)):
migration_api.downgrade(version)
cur_version = migration_api.db_version()
self.assertEqual(cur_version, version)