Merge branch 'testing' into dependabot/pip/websockets-9.1

This commit is contained in:
yalh76 2021-06-29 23:58:19 +02:00 committed by GitHub
commit 57eb5f4f1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View file

@ -1,5 +1,5 @@
aiofiles==0.4.0 aiofiles==0.4.0
aiohttp==3.4.4 aiohttp==3.7.4
argh==0.26.2 argh==0.26.2
async-timeout==3.0.1 async-timeout==3.0.1
attrs==18.2.0 attrs==18.2.0
@ -8,7 +8,7 @@ chardet==3.0.4
httptools==0.0.11 httptools==0.0.11
idna==2.8 idna==2.8
idna-ssl==1.1.0 idna-ssl==1.1.0
Jinja2==2.10.1 Jinja2==2.11.3
MarkupSafe==1.1.0 MarkupSafe==1.1.0
multidict==4.5.2 multidict==4.5.2
peewee==3.7.1 peewee==3.7.1
@ -16,7 +16,7 @@ requests==2.21.0
sanic==19.3.1 sanic==19.3.1
sanic-jinja2==0.7.2 sanic-jinja2==0.7.2
ujson==1.35 ujson==1.35
urllib3==1.24.2 urllib3==1.26.5
uvloop==0.11.3 uvloop==0.11.3
websockets==9.1 websockets==9.1
yarl==1.3.0 yarl==1.3.0

2
run.py
View file

@ -404,7 +404,7 @@ async def run_job(worker, job):
data = await command.stdout.readline() data = await command.stdout.readline()
try: try:
job.log += data.decode() job.log += data.decode('utf-8', 'replace')
except UnicodeDecodeError as e: except UnicodeDecodeError as e:
job.log += "Uhoh ?! UnicodeDecodeError in yunorunner !?" job.log += "Uhoh ?! UnicodeDecodeError in yunorunner !?"
job.log += str(e) job.log += str(e)