# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1449669293 0
# Node ID a41fd22e80cb0603c1f14bcdb95027e8ec2514b0
# Parent  c4f5cf1bfffd297e8537029e6919a9a9e789392f# Parent  6399abfdb127008cb8c21d40dae9bdff09640c57
Merge.

diff -r c4f5cf1bfffd -r a41fd22e80cb peat
--- a/peat	Sat Aug 29 16:20:03 2015 +0000
+++ b/peat	Wed Dec 09 13:54:53 2015 +0000
@@ -47,7 +47,7 @@
 
 def log(s):
     if verbose:
-        print s
+        print(s)
 
 def die(s):
     sys.stderr.write('ERROR: ' + s + '\n')
@@ -59,7 +59,7 @@
         try:
             if os.stat(p).st_mtime >= cutoff:
                 return True
-        except OSError, e:
+        except OSError as e:
             # If the file has been deleted since we started watching, don't
             # worry about it.
             if e.errno == errno.ENOENT: