39118ba34d89de621929ab8d9d8fdd874e68bb23 mmaddren Thu Mar 10 16:28:26 2011 -0800 Small update to previous commit, fixed a few errors diff --git python/ucscgenomics/rafile/RaFile.py python/ucscgenomics/rafile/RaFile.py index 1f8f5fb..f12842d 100644 --- python/ucscgenomics/rafile/RaFile.py +++ python/ucscgenomics/rafile/RaFile.py @@ -1,27 +1,27 @@ import sys import re -import orderedDict +import OrderedDict -class RaFile(orderedDict.OrderedDict): +class RaFile(OrderedDict.OrderedDict): """ Stores an Ra file in a set of entries, one for each stanza in the file. """ def __init__(self, entryType): self.__entryType = entryType - orderedDict.OrderedDict.__init__(self) + OrderedDict.OrderedDict.__init__(self) def read(self, filePath): """ Reads an rafile stanza by stanza, and internalizes it. """ file = open(filePath, 'r') entry = self.__entryType() stanza = list() keyValue = '' for line in file: line = line.strip() @@ -65,31 +65,31 @@ yield item, self[item] else: yield [item] def __str__(self): str = '' for item in self.iteritems(): if len(item) == 1: str += item[0].__str__() + '\n' else: str += item[1].__str__() + '\n' return str -class RaEntry(orderedDict.OrderedDict): +class RaEntry(OrderedDict.OrderedDict): """ Holds an individual entry in the RaFile. """ def readStanza(self, stanza): """ Populates this entry from a single stanza """ for line in stanza: self.__readLine(line) return self.__readName(stanza[0])