old_contents: import subprocess
  
  def _eintr_retry_call(func, *args):
  	while True:
  		try:
  			return func(*args)
  	except OSError, e:
  		if e.errno == errno.EINTR:
  			continue
  		raise
  
  def ct_query(filename):
  	cmd = 'ctags -n -u --fields=+K -f -'
  	args = cmd.split()
  	args.append(filename)
  	proc = subprocess.Popen(args, stdout=subprocess.PIPE)
  	(out_data, err_data) = _eintr_retry_call(proc.communicate)
  	out_data = out_data.split('\n')
  	res = []
  	for line in out_data:
  		if (line == ''):
  			break
  		line = line.split('\t')
  		num = line[2].split(';', 1)[0]
  		line = [line[0], num, line[3]]
  		res.append(line)
  	return res
  
new_contents: import subprocess
  
  def _eintr_retry_call(func, *args):
  	while True:
  		try:
  			return func(*args)
  		except OSError, e:
  			if e.errno == errno.EINTR:
  				continue
  			raise
  
  def ct_query(filename):
  	cmd = 'ctags -n -u --fields=+K -f -'
  	args = cmd.split()
  	args.append(filename)
  	proc = subprocess.Popen(args, stdout=subprocess.PIPE)
  	(out_data, err_data) = _eintr_retry_call(proc.communicate)
  	out_data = out_data.split('\n')
  	res = []
  	for line in out_data:
  		if (line == ''):
  			break
  		line = line.split('\t')
  		num = line[2].split(';', 1)[0]
  		line = [line[0], num, line[3]]
  		res.append(line)
  	return res
  
subject: Fix indention error - thought that was fixed before my last push