From: Faiyaz Ahmed <faiyaza@cs.princeton.edu>
Date: Mon, 26 Jan 2009 19:20:04 +0000 (+0000)
Subject: More formatting.
X-Git-Tag: sfa-0.9-0@14641~718
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7d8e0d533e65d1c3f0ea72456def8ce05b2254f8;p=sfa.git

More formatting.
---

diff --git a/util/rspec.py b/util/rspec.py
index 46018d9c..33f1df8a 100644
--- a/util/rspec.py
+++ b/util/rspec.py
@@ -10,7 +10,7 @@ class Rspec():
         self.xsd = xsd
         self.rootNode = None
         if xml:
-            self.parse_string(xml)
+            self.parseString(xml)
       
   
     def _getText(self, nodelist):
@@ -36,8 +36,8 @@ class Rspec():
                 name = node.attributes.get("name").value
         return name     
   
-  # Attribute.  {name : nameofattribute, {items: values})
-  def _attributeDict(self, attributeDom):
+    # Attribute.  {name : nameofattribute, {items: values})
+    def _attributeDict(self, attributeDom):
         '''Traverse single attribute node.  Create a dict {attributename : {name: value,}]}'''
         node = {} # parsed dict
         for attr in attributeDom.attributes.keys():
@@ -128,26 +128,26 @@ class Rspec():
             rootNode = node
         return rootNode
  
-def parseDict(self, rdict, include_doc = True):
-      """
-      Convert a dictionary into a dom object and store it.
-      """
-      self.rootNode = self.dict2dom(rdict, include_doc)
+    def parseDict(self, rdict, include_doc = True):
+        """
+        Convert a dictionary into a dom object and store it.
+        """
+        self.rootNode = self.dict2dom(rdict, include_doc)
  
  
-def getDictsByTagName(self, tagname, dom = None):
-      """
-      Search the dom for all elements with the specified tagname
-      and return them as a list of dicts
-      """
-      if not dom:
-          dom = self.rootNode
-      dicts = []
-      doms = dom.getElementsByTagName(tagname)
-      dictlist = [self.toDict(d) for d in doms]
-      for item in dictlist:
-          for value in item.values():
-              dicts.append(value)
-      return dicts
+    def getDictsByTagName(self, tagname, dom = None):
+        """
+        Search the dom for all elements with the specified tagname
+        and return them as a list of dicts
+        """
+        if not dom:
+            dom = self.rootNode
+        dicts = []
+        doms = dom.getElementsByTagName(tagname)
+        dictlist = [self.toDict(d) for d in doms]
+        for item in dictlist:
+            for value in item.values():
+                dicts.append(value)
+        return dicts
 
 #  vim:ts=4:expandtab