comparison Tests/Toolbox.py @ 192:6ff9d035b26b Orthanc-1.5.1

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 15 Dec 2018 10:50:45 +0100
parents 911070f790e3
children af8e034f4262
comparison
equal deleted inserted replaced
191:bc8bc83465dc 192:6ff9d035b26b
212 if (sys.version_info >= (3, 0)): 212 if (sys.version_info >= (3, 0)):
213 return zipfile.ZipFile(BytesIO(s), "r") 213 return zipfile.ZipFile(BytesIO(s), "r")
214 else: 214 else:
215 return zipfile.ZipFile(StringIO(s), "r") 215 return zipfile.ZipFile(StringIO(s), "r")
216 216
217 def PostArchive(orthanc, uri, body):
218 # http://stackoverflow.com/a/1313868/881731
219 s = DoPost(orthanc, uri, body)
220
221 if (sys.version_info >= (3, 0)):
222 return zipfile.ZipFile(BytesIO(s), "r")
223 else:
224 return zipfile.ZipFile(StringIO(s), "r")
225
217 def IsDefinedInLua(orthanc, name): 226 def IsDefinedInLua(orthanc, name):
218 s = DoPost(orthanc, '/tools/execute-script', 'print(type(%s))' % name, 'application/lua') 227 s = DoPost(orthanc, '/tools/execute-script', 'print(type(%s))' % name, 'application/lua')
219 return (s.strip() != 'nil') 228 return (s.strip() != 'nil')
220 229
221 def WaitEmpty(orthanc): 230 def WaitEmpty(orthanc):