py3++

3 files changed, 16 insertions, 14 deletions

diff --git a/pathod/pathoc.py b/pathod/pathoc.py
index f55a2eda..a49ed351 100644
--- a/pathod/pathoc.py
+++ b/pathod/pathoc.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import contextlib
 import sys
 import os
@@ -312,7 +313,7 @@ class Pathoc(tcp.TCPClient):
                 self.get_alpn_proto_negotiated()
             )
             if showssl:
-                print >> fp, str(self.sslinfo)
+                print(str(self.sslinfo), file=fp)
 
             if self.use_http2:
                 self.protocol.check_alpn()
@@ -498,10 +499,10 @@ def main(args):  # pragma: no cover
             try:
                 p.connect(args.connect_to, args.showssl)
             except TcpException as v:
-                print >> sys.stderr, str(v)
+                print(str(v), file=sys.stderr)
                 continue
             except PathocError as v:
-                print >> sys.stderr, str(v)
+                print(str(v), file=sys.stderr)
                 sys.exit(1)
             for spec in playlist:
                 if args.explain or args.memo:
@@ -514,7 +515,7 @@ def main(args):  # pragma: no cover
                     else:
                         trycount += 1
                         if trycount > args.memolimit:
-                            print >> sys.stderr, "Memo limit exceeded..."
+                            print("Memo limit exceeded...", file=sys.stderr)
                             return
                         else:
                             continue
diff --git a/pathod/pathoc_cmdline.py b/pathod/pathoc_cmdline.py
index b59704f3..a9603c40 100644
--- a/pathod/pathoc_cmdline.py
+++ b/pathod/pathoc_cmdline.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import sys
 import argparse
 import os
@@ -16,9 +17,9 @@ def args_pathoc(argv, stdout=sys.stdout, stderr=sys.stderr):
     )
     pa = preparser.parse_known_args(argv)[0]
     if pa.showua:
-        print >> stdout, "User agent strings:"
+        print("User agent strings:", file=stdout)
         for i in user_agents.UASTRINGS:
-            print >> stdout, "  ", i[1], i[0]
+            print("  ", i[1], i[0], file=stdout)
         sys.exit(0)
 
     parser = argparse.ArgumentParser(
@@ -213,8 +214,8 @@ def args_pathoc(argv, stdout=sys.stdout, stderr=sys.stderr):
         try:
             reqs.append(language.parse_pathoc(r, args.use_http2))
         except language.ParseException as v:
-            print >> stderr, "Error parsing request spec: %s" % v.msg
-            print >> stderr, v.marked()
+            print("Error parsing request spec: %s" % v.msg, file=stderr)
+            print(v.marked(), file=stderr)
             sys.exit(1)
     args.requests = reqs
 
diff --git a/pathod/pathod.py b/pathod/pathod.py
index b80da887..017ce072 100644
--- a/pathod/pathod.py
+++ b/pathod/pathod.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
 import copy
 import logging
 import os
@@ -484,20 +485,19 @@ def main(args):  # pragma: no cover
             webdebug=args.webdebug
         )
     except PathodError as v:
-        print >> sys.stderr, "Error: %s" % v
+        print("Error: %s" % v, file=sys.stderr)
         sys.exit(1)
     except language.FileAccessDenied as v:
-        print >> sys.stderr, "Error: %s" % v
+        print("Error: %s" % v, file=sys.stderr)
 
     if args.daemonize:
         utils.daemonize()
 
     try:
-        print "%s listening on %s:%s" % (
+        print("%s listening on %s" % (
             version.NAMEVERSION,
-            pd.address.host,
-            pd.address.port
-        )
+            repr(pd.address)
+        ))
         pd.serve_forever()
     except KeyboardInterrupt:
         pass