diff options
Diffstat (limited to 'barbicanclient')
| -rw-r--r-- | barbicanclient/tests/v1/test_cas.py | 8 | ||||
| -rw-r--r-- | barbicanclient/tests/v1/test_secrets.py | 28 | ||||
| -rw-r--r-- | barbicanclient/v1/orders.py | 4 | ||||
| -rw-r--r-- | barbicanclient/v1/secrets.py | 10 |
4 files changed, 25 insertions, 25 deletions
diff --git a/barbicanclient/tests/v1/test_cas.py b/barbicanclient/tests/v1/test_cas.py index 118cfdb..a352661 100644 --- a/barbicanclient/tests/v1/test_cas.py +++ b/barbicanclient/tests/v1/test_cas.py @@ -19,10 +19,10 @@ from barbicanclient.v1 import cas class CAData(object): - def __init__(self, description=u'Test CA description'): - self.name = u'Test CA' + def __init__(self, description='Test CA description'): + self.name = 'Test CA' self.description = description - self.plugin_name = u'Test CA Plugin' + self.plugin_name = 'Test CA Plugin' self.plugin_ca_id = 'plugin_uuid' now = timeutils.utcnow() @@ -35,7 +35,7 @@ class CAData(object): self.meta.append({'description': self.description}) self.ca_dict = {'meta': self.meta, - 'status': u'ACTIVE', + 'status': 'ACTIVE', 'plugin_name': self.plugin_name, 'plugin_ca_id': self.plugin_ca_id, 'created': self.created} diff --git a/barbicanclient/tests/v1/test_secrets.py b/barbicanclient/tests/v1/test_secrets.py index ef3f61b..bf5624e 100644 --- a/barbicanclient/tests/v1/test_secrets.py +++ b/barbicanclient/tests/v1/test_secrets.py @@ -27,14 +27,14 @@ from barbicanclient.v1 import secrets class SecretData(object): def __init__(self): - self.name = u'Self destruction sequence' - self.payload = u'the magic words are squeamish ossifrage' - self.payload_content_type = u'text/plain' - self.algorithm = u'AES' + self.name = 'Self destruction sequence' + self.payload = 'the magic words are squeamish ossifrage' + self.payload_content_type = 'text/plain' + self.algorithm = 'AES' self.created = str(timeutils.utcnow()) self.secret_dict = {'name': self.name, - 'status': u'ACTIVE', + 'status': 'ACTIVE', 'algorithm': self.algorithm, 'created': self.created} @@ -110,9 +110,9 @@ class WhenTestingSecrets(test_client.BaseEntityResource): secret_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(self.secret.name, secret_req['name']) - self.assertEqual(u'application/octet-stream', + self.assertEqual('application/octet-stream', secret_req['payload_content_type']) - self.assertEqual(u'base64', + self.assertEqual('base64', secret_req['payload_content_encoding']) self.assertNotEqual(binary_payload, secret_req['payload']) @@ -121,7 +121,7 @@ class WhenTestingSecrets(test_client.BaseEntityResource): data = {'secret_ref': self.entity_href} self.responses.post(self.entity_base + '/', json=data) - text_payload = u'time for an ice cold \U0001f37a' + text_payload = 'time for an ice cold \U0001f37a' secret = self.manager.create() secret.payload = text_payload @@ -129,7 +129,7 @@ class WhenTestingSecrets(test_client.BaseEntityResource): secret_req = jsonutils.loads(self.responses.last_request.text) self.assertEqual(text_payload, secret_req['payload']) - self.assertEqual(u'text/plain', secret_req['payload_content_type']) + self.assertEqual('text/plain', secret_req['payload_content_type']) def test_should_store_with_deprecated_content_type(self): """DEPRECATION WARNING @@ -141,7 +141,7 @@ class WhenTestingSecrets(test_client.BaseEntityResource): self.responses.post(self.entity_base + '/', json=data) payload = 'I should be octet-stream' - payload_content_type = u'text/plain' + payload_content_type = 'text/plain' secret = self.manager.create() secret.payload = payload @@ -165,8 +165,8 @@ class WhenTestingSecrets(test_client.BaseEntityResource): encoded_payload = base64.b64encode( b'F\x130\x89f\x8e\xd9\xa1\x0e\x1f\r\xf67uu\x8b' ).decode('UTF-8') - payload_content_type = u'application/octet-stream' - payload_content_encoding = u'base64' + payload_content_type = 'application/octet-stream' + payload_content_encoding = 'base64' secret = self.manager.create() secret.payload = encoded_payload @@ -444,7 +444,7 @@ class WhenTestingSecrets(test_client.BaseEntityResource): self.test_should_delete_from_object(self.entity_id) def test_should_update_from_manager(self, secret_ref=None): - text_payload = u'time for an ice cold \U0001f37a' + text_payload = 'time for an ice cold \U0001f37a' secret_ref = secret_ref or self.entity_href self.responses.put(self.entity_href, status_code=204) @@ -473,7 +473,7 @@ class WhenTestingSecrets(test_client.BaseEntityResource): # Verify the secret has the correct ref for testing updates self.assertEqual(secref_ref, secret.secret_ref) - text_payload = u'time for an ice cold \U0001f37a' + text_payload = 'time for an ice cold \U0001f37a' self.responses.put(self.entity_href, status_code=204) diff --git a/barbicanclient/v1/orders.py b/barbicanclient/v1/orders.py index 6b352c9..b9c11be 100644 --- a/barbicanclient/v1/orders.py +++ b/barbicanclient/v1/orders.py @@ -249,8 +249,8 @@ class Order(object, metaclass=abc.ABCMeta): class KeyOrder(Order, KeyOrderFormatter): """KeyOrders can be used to request random key material from Barbican""" _type = 'key' - _validMeta = (u'name', u'algorithm', u'mode', u'bit_length', u'expiration', - u'payload_content_type') + _validMeta = ('name', 'algorithm', 'mode', 'bit_length', 'expiration', + 'payload_content_type') def __init__(self, api, name=None, algorithm=None, bit_length=None, mode=None, expiration=None, payload_content_type=None, diff --git a/barbicanclient/v1/secrets.py b/barbicanclient/v1/secrets.py index 4a57860..8cd883e 100644 --- a/barbicanclient/v1/secrets.py +++ b/barbicanclient/v1/secrets.py @@ -170,7 +170,7 @@ class Secret(SecretFormatter): if self._content_types: return self._content_types elif self._payload_content_type: - return {u'default': self.payload_content_type} + return {'default': self.payload_content_type} return None @property @@ -268,7 +268,7 @@ class Secret(SecretFormatter): uuid_ref = base.calculate_uuid_ref(self._secret_ref, self._entity) payload_url = uuid_ref + '/payload' payload = self._api._get_raw(payload_url, headers=headers) - if self.payload_content_type == u'text/plain': + if self.payload_content_type == 'text/plain': self._payload = payload.decode('UTF-8') else: self._payload = payload @@ -322,14 +322,14 @@ class Secret(SecretFormatter): secret_dict['payload'] = ( base64.b64encode(self.payload) ).decode('UTF-8') - secret_dict['payload_content_type'] = u'application/octet-stream' - secret_dict['payload_content_encoding'] = u'base64' + secret_dict['payload_content_type'] = 'application/octet-stream' + secret_dict['payload_content_encoding'] = 'base64' elif type(self.payload) is str: ''' str is stored as text/plain ''' secret_dict['payload'] = self.payload - secret_dict['payload_content_type'] = u'text/plain' + secret_dict['payload_content_type'] = 'text/plain' secret_dict = base.filter_null_keys(secret_dict) LOG.debug("Request body: {0}".format(base.censored_copy(secret_dict, |