Allow GRD reader to process a custom GRDP file stored in a folder different from its parent GRD fil…

tools/grit/grit/grd_reader.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 '''Class for reading GRD files into memory, without processing them.
 '''
 
 import os.path
 import types
@@ skipping 66 matching lines @@
 
   def endElement(self, name):
     if self.ignore_depth:
       self.ignore_depth -= 1
       return
 
     if name == 'part':
       partnode = self.stack[-1]
       partnode.started_inclusion = True
       # Add the contents of the sub-grd file as children of the <part> node.
-      partname = partnode.GetInputPath()
-      if os.path.dirname(partname):
-        # TODO(benrg): Remove this limitation. (The problem is that GRIT
-        # assumes that files referenced from the GRD file are relative to
-        # a path stored in the root <grit> node.)
-        raise exception.GotPathExpectedFilenameOnly()
-      partname = os.path.join(self.dir, partname)
+      partname = os.path.join(self.dir, partnode.GetInputPath())
+      # Check the GRDP file exists.
+      if not os.path.exists(partname):
+        raise exception.FileNotFound()
       # Exceptions propagate to the handler in grd_reader.Parse().
       xml.sax.parse(partname, GrdPartContentHandler(self))
 
     if self.debug:
       print "End parsing of element %s" % name
     self.stack.pop().EndParsing()
 
     if name == self.stop_after:
       raise StopParsingException()
 
@@ skipping 114 matching lines @@
       handler.root.attrs['first_ids_file'] = first_ids_file
     # Assign first ids to the nodes that don't have them.
     handler.root.AssignFirstIds(filename_or_stream, defines)
 
   return handler.root
 
 
 if __name__ == '__main__':
   util.ChangeStdoutEncoding()
   print unicode(Parse(sys.argv[1]))