Give more simple message when a SyntaxError is thrown

gclient_utils.py

 # Copyright 2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 82 matching lines @@
     return None
   assert len(child_nodes) == 1
   return child_nodes[0].getAttribute(attribute_name)
 
 
 class Error(Exception):
   """gclient exception class."""
   pass
 
 
+def SyntaxErrorToError(filename, e):
+  """Raises a gclient_utils.Error exception with the human readable message"""
+  try:
+    # Try to construct a human readable error message
+    if filename:
+      error_message = 'There is a syntax error in %s\n' % filename
+    else:
+      error_message = 'There is a syntax error\n'
+    error_message += 'Line #%s, character %s: "%s"' % (
+        e.lineno, e.offset, re.sub(r'[\r\n]*$', '', e.text))
+  except:
+    # Something went wrong, re-raise the original exception
+    raise e
+  else:
+    raise Error(error_message)
+
+
 class PrintableObject(object):
   def __str__(self):
     output = ''
     for i in dir(self):
       if i.startswith('__'):
         continue
       output += '%s = %s\n' % (i, str(getattr(self, i, '')))
     return output
 
 
@@ skipping 234 matching lines @@
   config_path = FindFileUpwards(config_file, path)
 
   if not config_path:
     print "Can't find %s" % config_file
     return None
 
   env = {}
   execfile(config_path, env)
   config_dir = os.path.dirname(config_path)
   return config_dir, env['entries']