Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Expose jetty threadpool metrics via dropwizard
  Fix editing name & email for service user
  Fix accountBelongsToRealm implementation
  Fix support for python3 in download_bower.py

Change-Id: I4e2d984af74eac279ad22d11f3e606c3ef361c94
This commit is contained in:
David Pursehouse
2020-01-31 11:01:01 +09:00
13 changed files with 329 additions and 15 deletions

View File

@@ -46,7 +46,8 @@ def bower_info(bower, name, package, version):
raise
out, err = p.communicate()
if p.returncode:
sys.stderr.write(err)
# For python3 support we wrap str around err.
sys.stderr.write(str(err))
raise OSError('Command failed: %s' % ' '.join(cmd))
try: