# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1478502950 -7200
# Node ID 76e49e34b40a7570fb12eb93cb5cdf55e84834ad
# Parent  977ecff4bd7dbff3021fb6e8e683129b9cee7e9c
Changes required for Python 3.

diff -r 977ecff4bd7d -r 76e49e34b40a multimerge.py
--- a/multimerge.py	Mon Nov 07 09:10:29 2016 +0200
+++ b/multimerge.py	Mon Nov 07 09:15:50 2016 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # coding=utf-8
 ###
 ### Google Calendar MultiMerge
@@ -23,7 +23,7 @@
 from email.mime.text import MIMEText
 
 import httplib2
-import ConfigParser
+import configparser as ConfigParser
 
 import oauth2client
 from oauth2client import client
@@ -55,10 +55,7 @@
 ## to UTF-8 encoding in output here.
 def gcm_print(smsg):
     gcm_msgbuf.append(smsg)
-    if sys.stdout.encoding != None:
-        print(smsg.encode(sys.stdout.encoding))
-    else:
-        print(smsg.encode("UTF-8"))
+    print(smsg)
 
 
 ## Fatal error handler
@@ -202,7 +199,7 @@
     def __init__(self, src = None):
         if src == None:
             self.r = self.g = self.b = 0
-        elif isinstance(src, basestring):
+        elif isinstance(src, str):
             if len(src) == 6:
                 self.r = int(src[0:2], 16)
                 self.g = int(src[2:4], 16)
@@ -245,7 +242,7 @@
     bdist_fg = 99999999999
     bdist_bg = 99999999999
     best_fit = None
-    for id, col in colors.iteritems():
+    for id, col in colors.items():
         dist_fg = GCMColor(col["foreground"]).dist(c_fg)
         dist_bg = GCMColor(col["background"]).dist(c_bg)
         if dist_fg <= bdist_fg and dist_bg <= bdist_bg:
@@ -314,7 +311,7 @@
                 gcm_debug(4, u"{0} -> '{1}' == {2}".format(name, value, self.mget(name)))
 
     def is_str(self, mvalue):
-        return isinstance(mvalue, basestring)
+        return isinstance(mvalue, str)
 
     def is_string(self, mvalue):
         return mvalue == None or self.is_str(mvalue)