Upgrade to python3

kensho-technologies · Oct 3, 2017 · 05093bc · 05093bc
1 parent 828b69b
commit 05093bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/grift/loaders.py b/grift/loaders.py
@@ -6,10 +6,10 @@
 import requests
 import six
 
+
 @six.add_metaclass(ABCMeta)
 class AbstractLoader(object):
     """Base class for loading configuration settings from a source"""
-    pass
 
     def reload(self):
         """Reload values from the designated source, if possible"""
@@ -144,7 +144,7 @@ def _fetch_secrets(vault_url, path, token):
         resp.raise_for_status()
         data = resp.json()
         if data.get('errors'):
-            raise VaultException(six.u('Error fetching Vault secrets from path {}: {}')
+            raise VaultException('Error fetching Vault secrets from path {}: {}'
                                  .format(path, data['errors']))
         return data['data']
 
@@ -156,7 +156,7 @@ def _fetch_app_role_token(vault_url, role_id, secret_id):
         resp.raise_for_status()
         data = resp.json()
         if data.get('errors'):
-            raise VaultException(six.u('Error fetching Vault token: {}'.format(data['errors'])))
+            raise VaultException('Error fetching Vault token: {}'.format(data['errors']))
         return data['auth']['client_token']
 
     def reload(self):
@@ -170,7 +170,7 @@ def lookup_token(self):
         resp.raise_for_status()
         data = resp.json()
         if data.get('errors'):
-            raise VaultException(six.u('Error looking up Vault token: {}'.format(data['errors'])))
+            raise VaultException('Error looking up Vault token: {}'.format(data['errors']))
         return data
 
     def renew_token(self):
@@ -180,7 +180,7 @@ def renew_token(self):
         resp.raise_for_status()
         data = resp.json()
         if data.get('errors'):
-            raise VaultException(six.u('Error renewing Vault token: {}'.format(data['errors'])))
+            raise VaultException('Error renewing Vault token: {}'.format(data['errors']))
         return data
 
 

diff --git a/grift/tests/test_config.py b/grift/tests/test_config.py
@@ -1,10 +1,10 @@
 # Copyright 2017 Kensho Technologies, Inc.
 import os
-import six
 from unittest import TestCase
 
 from schematics.exceptions import ConversionError
 from schematics.types import StringType, IntType
+import six
 
 from grift.config import BaseConfig, ConfigProperty
 from grift.loaders import DictLoader, EnvLoader, JsonFileLoader