~azzar1/unity/add-show-desktop-key

(simple)json always returns a unicode when decoding, while cjson returned a str where possible. This makes cPickle unhappy, so convert back to a str.

added added

removed removed

247

248

# Unpickle the globals

249

for g in globals['globals']:

250

globals['globals'][g] = cPickle.loads(globals['globals'][g])

250

globals['globals'][g] = cPickle.loads(str(globals['globals'][g]))

251

252

return globals['globals']

253

266

# Unpickle any exceptions

267

if 'exception' in call:

268

call['exception']['except'] = \

269

cPickle.loads(call['exception']['except'])

269

cPickle.loads(str(call['exception']['except']))

270

271

return call

272

278

279

# Unpickle any exceptions

280

if 'exception' in execute:

281

execute['exception'] = cPickle.loads(execute['exception'])

281

execute['exception'] = cPickle.loads(str(execute['exception']))

282

return execute

283

284