Skip to content

Commit

Permalink
Merge branch 'branch-0.9'
Browse files Browse the repository at this point in the history
  • Loading branch information
da4089 committed Dec 17, 2024
2 parents 1e99406 + 7795f97 commit 1135bae
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions vobject/ics_diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,8 @@ def processComponentPair(leftComp, rightComp):
if len(differentContentLines) == 0 and len(differentComponents) == 0:
return None
else:
left = newFromBehavior(leftComp.name)
right = newFromBehavior(leftComp.name)
left = vobject.newFromBehavior(leftComp.name)
right = vobject.newFromBehavior(leftComp.name)
# add a UID, if one existed, despite the fact that they'll always be
# the same
uid = leftComp.getChildValue('uid')
Expand Down Expand Up @@ -193,8 +193,8 @@ def main():
ignore_dtstamp = options.ignore
ics_file1, ics_file2 = args
with open(ics_file1) as f, open(ics_file2) as g:
cal1 = readOne(f)
cal2 = readOne(g)
cal1 = vobject.readOne(f)
cal2 = vobject.readOne(g)
deleteExtraneous(cal1, ignore_dtstamp=ignore_dtstamp)
deleteExtraneous(cal2, ignore_dtstamp=ignore_dtstamp)
prettyDiff(cal1, cal2)
Expand Down

0 comments on commit 1135bae

Please sign in to comment.