Fix 2to3 oddities

src/build-scripts/dfu-convert.py

@@ -25,37 +25,37 @@ def rev2byte(revision):
  return (int(ma,16)<<8 | int(mi,16))
 
 def parse(file,dump_images=False):
- print(('File: "%s"' % file))
+ print('File: "%s"' % file)
  data = open(file,'rb').read()
  crc = compute_crc(data[:-4])
  prefix, data = consume('<5sBIB',data,'signature version size targets')
- print(('%(signature)s v%(version)d, image size: %(size)d, targets: %(targets)d' % prefix))
+ print('%(signature)s v%(version)d, image size: %(size)d, targets: %(targets)d' % prefix)
  for t in range(prefix['targets']):
  tprefix, data = consume('<6sBI255s2I',data,'signature altsetting named name size elements')
  tprefix['num'] = t
  if tprefix['named']:
  tprefix['name'] = cstring(tprefix['name'])
  else:
  tprefix['name'] = ''
- print(('%(signature)s %(num)d, alt setting: %(altsetting)s, name: "%(name)s", size: %(size)d, elements: %(elements)d' % tprefix))
+ print('%(signature)s %(num)d, alt setting: %(altsetting)s, name: "%(name)s", size: %(size)d, elements: %(elements)d' % tprefix)
  tsize = tprefix['size']
  target, data = data[:tsize], data[tsize:]
  for e in range(tprefix['elements']):
  eprefix, target = consume('<2I',target,'address size')
  eprefix['num'] = e
- print((' %(num)d, address: 0x%(address)08x, size: %(size)d' % eprefix))
+ print(' %(num)d, address: 0x%(address)08x, size: %(size)d' % eprefix)
  esize = eprefix['size']
  image, target = target[:esize], target[esize:]
  if dump_images:
  out = '%s.target%d.image%d.bin' % (file,t,e)
  open(out,'wb').write(image)
- print((' DUMPED IMAGE TO "%s"' % out))
+ print(' DUMPED IMAGE TO "%s"' % out)
  if len(target):
- print(("target %d: PARSE ERROR" % t))
+ print("target %d: PARSE ERROR" % t)
  suffix = named(struct.unpack('<4H3sBI',data[:16]),'device product vendor dfu ufd len crc')
- print(('usb: %(vendor)04x:%(product)04x, device: 0x%(device)04x, dfu: 0x%(dfu)04x, %(ufd)s, %(len)d, 0x%(crc)08x' % suffix))
+ print('usb: %(vendor)04x:%(product)04x, device: 0x%(device)04x, dfu: 0x%(dfu)04x, %(ufd)s, %(len)d, 0x%(crc)08x' % suffix)
  if crc != suffix['crc']:
- print(("CRC ERROR: computed crc32 is 0x%08x" % crc))
+ print("CRC ERROR: computed crc32 is 0x%08x" % crc)
  data = data[16:]
  if data:
  print("PARSE ERROR")
@@ -103,15 +103,15 @@ def build(file,targets,device=DEFAULT_DEVICE, revision="0.0"):
  try:
  address,binfile = arg.split(':',1)
  except ValueError:
- print(("Address:file couple '%s' invalid." % arg))
+ print("Address:file couple '%s' invalid." % arg)
  sys.exit(1)
  try:
  address = int(address,0) & 0xFFFFFFFF
  except ValueError:
- print(("Address %s invalid." % address))
+ print("Address %s invalid." % address)
  sys.exit(1)
  if not os.path.isfile(binfile):
- print(("Unreadable file '%s'." % binfile))
+ print("Unreadable file '%s'." % binfile)
  sys.exit(1)
  target.append({ 'address': address, 'data': open(binfile,'rb').read() })
 
@@ -123,7 +123,7 @@ def build(file,targets,device=DEFAULT_DEVICE, revision="0.0"):
  try:
  address = address & 0xFFFFFFFF
  except ValueError:
- print(("Address %s invalid." % address))
+ print("Address %s invalid." % address)
  sys.exit(1)
  target.append({ 'address': address, 'data': data })
 
@@ -143,13 +143,13 @@ def build(file,targets,device=DEFAULT_DEVICE, revision="0.0"):
  try:
  v,d=[int(x,0) & 0xFFFF for x in device.split(':',1)]
  except:
- print(("Invalid device '%s'." % device))
+ print("Invalid device '%s'." % device)
  sys.exit(1)
  build(outfile,[target],device, revision)
  elif len(args)==1:
  infile = args[0]
  if not os.path.isfile(infile):
- print(("Unreadable file '%s'." % infile))
+ print("Unreadable file '%s'." % infile)
  sys.exit(1)
  parse(infile, dump_images=options.dump_images)
  else:

src/build-scripts/hydrafw-revision.py

@@ -7,4 +7,4 @@
 
 git=Repo(search_parent_directories=True).git
 version = git.describe(tags=True,always=True,dirty=True,long=True)
-print((r.search(version).group(1)))
+print(r.search(version).group(1))

src/build-scripts/hydrafw-version.py

@@ -14,8 +14,8 @@
 if len(args)==1:
  sys.stdout = open(args[0], 'w')
  git=Repo(search_parent_directories=True).git
- print(('#define HYDRAFW_GIT_TAG "' + git.describe(tags=True,always=True,dirty=True,long=True) + '"'))
- print(('#define HYDRAFW_CHECKIN_DATE "' + git.show(['-s', '--pretty=format:%ai']).partition(' ')[0] + '"'))
+ print('#define HYDRAFW_GIT_TAG "' + git.describe(tags=True,always=True,dirty=True,long=True) + '"')
+ print('#define HYDRAFW_CHECKIN_DATE "' + git.show(['-s', '--pretty=format:%ai']).partition(' ')[0] + '"')
 else:
  parser.print_help()
  sys.exit(1)