# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1467627601 -10800
# Node ID 4168dde804aed986a4d50fa1055106a43b966bdf
# Parent  9a4dd2eb77016de68789458c1a9d93706664e816
Rename some variables.

diff -r 9a4dd2eb7701 -r 4168dde804ae multimerge.py
--- a/multimerge.py	Mon Jul 04 13:09:55 2016 +0300
+++ b/multimerge.py	Mon Jul 04 13:20:01 2016 +0300
@@ -329,14 +329,14 @@
 calPageToken = None
 while True:
     # We want everything except deleted and hidden calendars
-    calResult = service.calendarList().list(
+    result = service.calendarList().list(
         showHidden=False,
         showDeleted=False,
         pageToken=calPageToken
         ).execute()
 
-    calendars.extend(calResult.get("items", []))
-    calPageToken = calResult.get("nextPageToken")
+    calendars.extend(result.get("items", []))
+    calPageToken = result.get("nextPageToken")
     if not calPageToken:
         break
 
@@ -369,15 +369,16 @@
 calEvents = []
 for calendar in src_calendars:
     gcm_debug("- "+calendar["id"])
-    eventsResult = service.events().list(
+    result = service.events().list(
         timeZone="EEST",
         calendarId=calendar["id"],
         singleEvents=True,
         showDeleted=False,
-        orderBy="startTime").execute()
+#        orderBy="startTime",
+        ).execute()
 
     # Add events, if any, to main list
-    events = eventsResult.get("items", [])
+    events = result.get("items", [])
     if events:
         calEvents.append(events)
         if cfg.debug:
@@ -386,12 +387,12 @@
 
 ## Get current events
 gcm_debug(u"Fetching current target calendar events {0}".format(cfg.dest_id))
-eventsResult = service.events().list(
+result = service.events().list(
     calendarId=cfg.dest_id,
     singleEvents=True,
     showDeleted=True).execute()
 
-currEvents = eventsResult.get("items", [])
+currEvents = result.get("items", [])
 if currEvents:
     gcm_debug(u"Found {0} event(s).".format(len(currEvents)))
 else: