# HG changeset patch # User Matti Hamalainen # Date 1467629434 -10800 # Node ID 095209b1ded39598962df3751dee4ddff88ff6fc # Parent b6f27067d25da3761a8af956273bbf1e1b931798 Rename some variables. diff -r b6f27067d25d -r 095209b1ded3 multimerge.py --- a/multimerge.py Mon Jul 04 13:31:54 2016 +0300 +++ b/multimerge.py Mon Jul 04 13:50:34 2016 +0300 @@ -325,18 +325,18 @@ ## Fetch complete calendar list gcm_debug("Fetching available calendars ..") calendars = [] -calPageToken = None +cal_token = None while True: # We want everything except deleted and hidden calendars result = service.calendarList().list( showHidden=False, showDeleted=False, - pageToken=calPageToken + pageToken=cal_token ).execute() calendars.extend(result.get("items", [])) - calPageToken = result.get("nextPageToken") - if not calPageToken: + cal_token = result.get("nextPageToken") + if not cal_token: break if len(calendars) == 0: @@ -365,7 +365,7 @@ ## Now, we fetch and collect events gcm_debug(u"Fetching calendar events .. ") -calEvents = [] +src_events = [] for calendar in src_calendars: gcm_debug("- "+calendar["id"]) result = service.events().list( @@ -379,7 +379,7 @@ # Add events, if any, to main list events = result.get("items", []) if events: - calEvents.append(events) + src_events.append(events) if cfg.debug: gcm_dump_events(events) @@ -391,9 +391,9 @@ singleEvents=True, showDeleted=True).execute() -currEvents = result.get("items", []) -if currEvents: - gcm_debug(u"Found {0} event(s).".format(len(currEvents))) +curr_events = result.get("items", []) +if curr_events: + gcm_debug(u"Found {0} event(s).".format(len(curr_events))) else: gcm_debug(u"No current events.")