comparison Tests/Toolbox.py @ 543:8722f7f95a38

fix
author Alain Mazy <am@osimis.io>
date Tue, 20 Jun 2023 17:24:56 +0200
parents 3f8eebe85c37
children 9f8276ac1cdd
comparison
equal deleted inserted replaced
542:3f8eebe85c37 543:8722f7f95a38
421 421
422 else: 422 else:
423 self.assertAlmostEqual(a, b, places = places) 423 self.assertAlmostEqual(a, b, places = places)
424 424
425 425
426 def GetTransferSyntax(dicom): 426 def GetTransferSyntax(dicom, encoding='utf-8'):
427 with tempfile.NamedTemporaryFile(delete = True) as f: 427 with tempfile.NamedTemporaryFile(delete = True) as f:
428 f.write(dicom) 428 f.write(dicom)
429 f.flush() 429 f.flush()
430 430
431 with open(os.devnull, 'w') as devnull: 431 with open(os.devnull, 'w') as devnull:
432 data = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ], 432 data = subprocess.check_output([ FindExecutable('dcm2xml'), f.name ],
433 stderr = devnull) 433 stderr = devnull)
434 return re.search('<data-set xfer="(.*?)"', data.decode('utf-8')).group(1) 434 return re.search('<data-set xfer="(.*?)"', data.decode(encoding)).group(1)
435 435
436 436
437 def HasGdcmPlugin(orthanc): 437 def HasGdcmPlugin(orthanc):
438 plugins = DoGet(orthanc, '/plugins') 438 plugins = DoGet(orthanc, '/plugins')
439 return ('gdcm' in plugins) 439 return ('gdcm' in plugins)