1.1 --- a/imiptools/data.py	Sun Feb 08 18:39:03 2015 +0100
     1.2 +++ b/imiptools/data.py	Sun Feb 08 20:06:37 2015 +0100
     1.3 @@ -101,21 +101,22 @@
     1.4              nodes
     1.5             )
     1.6  
     1.7 -def make_freebusy(freebusy, uid, organiser, attendee=None):
     1.8 +def make_freebusy(freebusy, uid, organiser, organiser_attr=None, attendee=None, attendee_attr=None):
     1.9      
    1.10      """
    1.11      Return a calendar node defining the free/busy details described in the given
    1.12 -    'freebusy' list, employing the given 'uid', for the given 'organiser', with
    1.13 -    the optional 'attendee' providing recipient details.
    1.14 +    'freebusy' list, employing the given 'uid', for the given 'organiser' and
    1.15 +    optional 'organiser_attr', with the optional 'attendee' providing recipient
    1.16 +    details together with the optional 'attendee_attr'.
    1.17      """
    1.18      
    1.19      record = []
    1.20      rwrite = record.append
    1.21      
    1.22 -    rwrite(("ORGANIZER", {}, organiser))
    1.23 +    rwrite(("ORGANIZER", organiser_attr or {}, organiser))
    1.24  
    1.25      if attendee:
    1.26 -        rwrite(("ATTENDEE", {}, attendee)) 
    1.27 +        rwrite(("ATTENDEE", attendee_attr or {}, attendee)) 
    1.28  
    1.29      rwrite(("UID", {}, uid))
    1.30