Histograms.xml python script housekeeping

tools/metrics/histograms/pretty_print.py

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 """Pretty-prints the histograms.xml file, alphabetizing tags, wrapping text
 at 80 chars, enforcing standard attribute ordering, and standardizing
 indentation.
 
 This is quite a bit more complicated than just calling tree.toprettyxml();
 we need additional customization, like special attribute ordering in tags
 and wrapping text nodes, so we implement our own full custom XML pretty-printer.
 """
 
 from __future__ import with_statement
 
 import logging
 import os
 import shutil
 import sys
 import xml.dom.minidom
 
-import print_style
-
-sys.path.insert(1, os.path.join(sys.path[0], '..', '..', 'python'))
-from google import path_utils
-
-# Import the metrics/common module.
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'common'))
 import diff_util
 import presubmit_util
 
+import print_style
+
 # Tags whose children we want to alphabetize. The key is the parent tag name,
 # and the value is a pair of the tag name of the children we want to sort,
 # and a key function that maps each child node to the desired sort key.
 ALPHABETIZATION_RULES = {
   'histograms': ('histogram', lambda n: n.attributes['name'].value.lower()),
   'enums': ('enum', lambda n: n.attributes['name'].value.lower()),
   'enum': ('int', lambda n: int(n.attributes['value'].value)),
   'histogram_suffixes_list': (
       'histogram_suffixes', lambda n: n.attributes['name'].value.lower()),
   'histogram_suffixes': ('affected-histogram',
@@ skipping 23 matching lines @@
 
   Args:
     node: The minidom node to transform.
 
   Returns:
     The minidom node, with children appropriately alphabetized. Note that the
     transformation is done in-place, i.e. the original minidom tree is modified
     directly.
   """
   if node.nodeType != xml.dom.minidom.Node.ELEMENT_NODE:
-    for c in node.childNodes: TransformByAlphabetizing(c)
+    for c in node.childNodes:
+      TransformByAlphabetizing(c)
     return node
 
   # Element node with a tag name that we alphabetize the children of?
   if node.tagName in ALPHABETIZATION_RULES:
     # Put subnodes in a list of node,key pairs to allow for custom sorting.
     subtag, key_function = ALPHABETIZATION_RULES[node.tagName]
     subnodes = []
     sort_key = -1
     pending_node_indices = []
     for c in node.childNodes:
@@ skipping 20 matching lines @@
     subnodes.sort(key=lambda pair: pair[1])
 
     # Re-add the subnodes, transforming each recursively.
     while node.firstChild:
       node.removeChild(node.firstChild)
     for (c, _) in subnodes:
       unsafeAppendChild(node, TransformByAlphabetizing(c))
     return node
 
   # Recursively handle other element nodes and other node types.
-  for c in node.childNodes: TransformByAlphabetizing(c)
+  for c in node.childNodes:
+    TransformByAlphabetizing(c)
   return node
 
 
 def PrettyPrint(raw_xml):
   """Pretty-print the given XML.
 
   Args:
     raw_xml: The contents of the histograms XML file, as a string.
 
   Returns:
     The pretty-printed version.
   """
   tree = xml.dom.minidom.parseString(raw_xml)
   tree = TransformByAlphabetizing(tree)
   return print_style.GetPrintStyle().PrettyPrintNode(tree)
 
+
 def main():
   presubmit_util.DoPresubmitMain(sys.argv, 'histograms.xml',
                                  'histograms.before.pretty-print.xml',
                                  'pretty_print.py', PrettyPrint)
 
 if __name__ == '__main__':
   main()