diff options
author | Martin Poirier <theeth@yahoo.com> | 2010-09-12 18:04:54 +0400 |
---|---|---|
committer | Martin Poirier <theeth@yahoo.com> | 2010-09-12 18:04:54 +0400 |
commit | 797bb93b21fdcb0f9dcd60259d5a65f7098318f8 (patch) | |
tree | 6f9e933bcedd7e269fdafbcea103eeb4576b77ea /release/scripts/io/netrender/client.py | |
parent | 74059891e9f3652c4164257e4980c68e1349ec91 (diff) |
bugfix for [#23737] reported by Mariusz Maximus
netrender client's functions to get slaves and jobs info didn't work anymore (was reading response content twice).
At the same time, I switched to json for the dump and load, instead of using eval and repr (for obvious security reasons). I should have done this much earlier.
Diffstat (limited to 'release/scripts/io/netrender/client.py')
-rw-r--r-- | release/scripts/io/netrender/client.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/io/netrender/client.py b/release/scripts/io/netrender/client.py index b6fc66590df..c17944725b0 100644 --- a/release/scripts/io/netrender/client.py +++ b/release/scripts/io/netrender/client.py @@ -20,6 +20,7 @@ import bpy import sys, os, re import http, http.client, http.server, urllib import subprocess, shutil, time, hashlib +import json import netrender import netrender.model @@ -169,7 +170,7 @@ def clientSendJob(conn, scene, anim = False): job.priority = netsettings.priority # try to send path first - conn.request("POST", "/job", repr(job.serialize())) + conn.request("POST", "/job", json.dumps(job.serialize())) response = conn.getresponse() response.read() |