Skip to content

Commit

Permalink
Merge pull request #66 from ecederstrand/patch-1
Browse files Browse the repository at this point in the history
Pull in upstream commit 2dc1dee
  • Loading branch information
Bill authored May 24, 2021
2 parents f169500 + 79a1980 commit e65decc
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions exchangelib/properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -647,15 +647,17 @@ class FreeBusyView(EWSElement):
@classmethod
def from_xml(cls, elem, account):
kwargs = {}
working_hours_elem = elem.find('{%s}WorkingHours' % TNS)
for f in cls.FIELDS:
if f.name == 'working_hours':
kwargs[f.name] = f.from_xml(elem=elem.find('{%s}WorkingHours' % TNS), account=account)
if working_hours_elem is None:
continue
kwargs[f.name] = f.from_xml(elem=working_hours_elem, account=account)
continue
kwargs[f.name] = f.from_xml(elem=elem, account=account)
elem.clear()
return cls(**kwargs)


class RoomList(Mailbox):
# MSDN: https://msdn.microsoft.com/en-us/library/office/dd899514(v=exchg.150).aspx
ELEMENT_NAME = 'RoomList'
Expand Down

0 comments on commit e65decc

Please sign in to comment.