Changeset 104:dac79db8ac3b

Show
Ignore:
Timestamp:
02/14/10 20:08:01 (7 months ago)
Author:
Roger Gammans <rgammans@…>
Branch:
default
Message:

remove parent/owner confusion from schema..

Location:
MysteryMachine
Files:
5 modified

Legend:

Unmodified
Added
Removed
  • MysteryMachine/parsetools/MMParser.py

    r101 r104  
    8080    if src is None: 
    8181        src =repr(self.myobject)+":unknown" 
    82     src = repr(self.myobject.parent)+":"+src 
     82    src = repr(self.myobject.owner)+":"+src 
    8383    role_def = ".. role:: mm(mmbase)\n :systemcntxt: %s\n\n" % src 
    8484    role_def+= "\n".join(map(lambda x: " "+x,src_stack)) 
  • MysteryMachine/schema/MMAttribute.py

    r99 r104  
    5959  """ 
    6060     
    61   def __init__(self,name,value,parent): 
     61  def __init__(self,name,value,owner): 
    6262    self.name=name 
    6363    self.valueobj=CreateAttributeValue(value) 
    64     self.parent=parent 
     64    self.owner=owner 
    6565 
    6666  def get_owner(self): 
    67     return self.parent 
     67    return self.owner 
    6868 
    6969  def __str__(self): 
     
    8181    @author 
    8282    """ 
    83     return repr(self.parent)+":"+self.name 
     83    return repr(self.owner)+":"+self.name 
    8484 
    8585  def GetFullExpansion(self): 
     
    8989    @return string : 
    9090    """ 
    91     return self.parent.parser.GetString(self.get_raw_rst(),repr(self)) 
     91    return self.owner.parser.GetString(self.get_raw_rst(),repr(self)) 
    9292 
    9393  #Special case to override the definiton in Base. 
     
    120120 
    121121  def _writeback(self): 
    122      self.parent[self.name] = self.valueobj 
     122     self.owner[self.name] = self.valueobj 
  • MysteryMachine/schema/MMAttributeValue.py

    r94 r104  
    185185            grammar.parse(self.get_raw_rst()) 
    186186        else: 
    187             attr.parent.parser.ProcessRawRst(self.get_raw_rst()) 
     187            attr.owner.parser.ProcessRawRst(self.get_raw_rst()) 
    188188    except: 
    189189        ok = False 
  • MysteryMachine/schema/MMBase.py

    r103 r104  
    9595    a member of. 
    9696    """ 
    97     root = self.parent 
    98     # Walk up the parent links 
    99     while hasattr(root,"parent") and root.parent != None: 
    100         root = root.parent 
     97    root = self.owner 
     98    # Walk up the owner links 
     99    while hasattr(root,"owner") and root.owner != None: 
     100        root = root.owner 
    101101    return root 
    102102 
  • MysteryMachine/schema/MMObject.py

    r99 r104  
    5656  """ 
    5757 
    58   def __init__(self, id,parent,store): 
     58  def __init__(self, id,owner,store): 
    5959    """ 
    6060     Get an object handle on an existing object with id. 
     
    6767#    self.logger.debug( "Creating %s" % id) 
    6868    self.id = id 
    69     #Ensure strong ref to parent. 
    70     self.parent = parent.getSelf() 
     69    #Ensure strong ref to owner. 
     70    self.owner = owner.getSelf() 
    7171    self.store = store 
    7272    self.parser = MMParser(self)