objdictgen/nodelist.py
changeset 243 7fcc129a06ce
parent 242 4864f7f01e1d
child 253 bf58ce630b88
equal deleted inserted replaced
242:4864f7f01e1d 243:7fcc129a06ce
    97         if not os.path.exists(self.EDSFolder):
    97         if not os.path.exists(self.EDSFolder):
    98             return "\"%s\" folder doesn't contain a \"eds\" folder"%self.Root
    98             return "\"%s\" folder doesn't contain a \"eds\" folder"%self.Root
    99         
    99         
   100         files = os.listdir(self.EDSFolder)
   100         files = os.listdir(self.EDSFolder)
   101         for file in files:
   101         for file in files:
   102             result = self.LoadEDS(file)
   102             filepath = os.path.join(self.EDSFolder, file)
   103             if result != None:
   103             if os.path.isfile(filepath) and os.path.splitext(filepath)[-1] == ".eds":
   104                 return result
   104                 result = self.LoadEDS(file)
       
   105                 if result != None:
       
   106                     return result
   105                 
   107                 
   106         result = self.LoadMasterNode(netname)
   108         result = self.LoadMasterNode(netname)
   107         if result != None:
   109         if result != None:
   108             return result
   110             return result
   109             
   111