openstack/python-keystoneclient
Code Issues Proposed changes

Python 3: Fix an str vs bytes issue in tempfile

Browse Source 
In Python 3, one cannot write:

    from tempfile import NamedTemporaryFile
    with NamedTemporaryFile() as f:
        f.write('foobar')

The input of f.write() must be bytes. Encode it when necessary in
middleware/auth_token.py, in a way that is compatible with Python 2.

Change-Id: Ib60afbc5e01c35f59cd7c9b68bfedb10ad897ff9
This commit is contained in:
Cyril Roelandt
2014-01-17 01:12:26 +01:00
parent a0ebd5ee6d
commit b6bfbd3e08
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
keystoneclient/middleware/auth_token.py
View File

@@ -1316,7 +1316,8 @@ class AuthProtocol(object):
if list_is_current: if list_is_current:
# Load the list from disk if required # Load the list from disk if required
if not self._token_revocation_list: if not self._token_revocation_list:
with open(self.revoked_file_name, 'r') as f: open_kwargs = {'encoding': 'utf-8'} if six.PY3 else {}
with open(self.revoked_file_name, 'r', **open_kwargs) as f:
self._token_revocation_list = jsonutils.loads(f.read()) self._token_revocation_list = jsonutils.loads(f.read())
else: else:
self.token_revocation_list = self.fetch_revocation_list() self.token_revocation_list = self.fetch_revocation_list()
@@ -1334,6 +1335,10 @@ class AuthProtocol(object):
with tempfile.NamedTemporaryFile(dir=self.signing_dirname, with tempfile.NamedTemporaryFile(dir=self.signing_dirname,
delete=False) as f: delete=False) as f:
# In Python2, encoding is slow so the following check avoids it if
# it is not absolutely necessary.
if isinstance(value, six.text_type):
value = value.encode('utf-8')
f.write(value) f.write(value)
os.rename(f.name, self.revoked_file_name) os.rename(f.name, self.revoked_file_name)