openstack/election
Code Issues Proposed changes

Make get_email() work with python3

Browse Source 
If you try to build the docs with python3 you'll see something ending
with:
    ValueError: Couldn't find gerrit account with 'b'dmccowan@cisco.com''

This is because the default encoding from subprocess.Popen() under
python3 is bytes() which then fails to work with the gerrit API.

Check we have a text_type and decode() if needed.

Change-Id: Iccbc891a33d15ef82ddbc913549e64547a967195
This commit is contained in:
Tony Breeds 2017-07-14 12:05:21 +10:00
parent e9d300dcf3
commit c217a1db8b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openstack_election/utils.py
View File

@ -21,6 +21,7 @@ import pickle
import pytz import pytz
import re import re
import requests import requests
import six
import subprocess import subprocess
import time import time
import yaml import yaml
@ -77,7 +78,12 @@ def gerrit_query(url):
def get_email(filepath): def get_email(filepath):
cmd = ["git", "log", "--follow", "--format=%aE", filepath] cmd = ["git", "log", "--follow", "--format=%aE", filepath]
git = subprocess.Popen(cmd, stdout=subprocess.PIPE) git = subprocess.Popen(cmd, stdout=subprocess.PIPE)
return git.stdout.readlines()[-1][:-1] email = git.stdout.readlines()[-1][:-1]
# Force to text_type in py2 or py3
if isinstance(email, six.text_type):
return email
else:
return email.decode('utf-8')
def get_gerrit_account(email): def get_gerrit_account(email):