Merge pull request #112 from a-detiste/master

remove leftover python2 "print"s

doc/listings/copyable-receive.py

@@ -18,9 +18,9 @@ def setCopyableState(self, d):
         self.shoe_size = "they wouldn't tell us"
 
     def display(self):
-        print "Name:", self.name
-        print "Age:", self.age
-        print "Shoe Size:", self.shoe_size
+        print("Name:", self.name)
+        print("Age:", self.age)
+        print("Shoe Size:", self.shoe_size)
 
 def getRecord(rref, name):
     d = rref.callRemote("getuser", name=name)

doc/listings/copyable-send.py

@@ -37,6 +37,6 @@ def remote_getuser(self, name):
 tub.listenOn("tcp:12345")
 tub.setLocation("localhost:12345")
 url = tub.registerReference(db, "database")
-print "the database is at:", url
+print("the database is at:", url)
 tub.startService()
 reactor.run()

doc/listings/pb2client.py

@@ -5,25 +5,25 @@
 from foolscap.api import Tub
 
 def gotError1(why):
-    print "unable to get the RemoteReference:", why
+    print("unable to get the RemoteReference:", why)
     reactor.stop()
 
 def gotError2(why):
-    print "unable to invoke the remote method:", why
+    print("unable to invoke the remote method:", why)
     reactor.stop()
 
 def gotReference(remote):
-    print "got a RemoteReference"
-    print "asking it to add 1+2"
+    print("got a RemoteReference")
+    print("asking it to add 1+2")
     d = remote.callRemote("add", a=1, b=2)
     d.addCallbacks(gotAnswer, gotError2)
 
 def gotAnswer(answer):
-    print "the answer is", answer
+    print("the answer is", answer)
     reactor.stop()
 
 if len(sys.argv) < 2:
-    print "Usage: pb2client.py URL"
+    print("Usage: pb2client.py URL")
     sys.exit(1)
 url = sys.argv[1]
 tub = Tub()

doc/listings/pb2server.py

@@ -14,7 +14,7 @@ def remote_subtract(self, a, b):
 tub.listenOn("tcp:12345")
 tub.setLocation("localhost:12345")
 url = tub.registerReference(myserver, "math-service")
-print "the object is available at:", url
+print("the object is available at:", url)
 
 tub.startService()
 reactor.run()

doc/listings/pb3calculator.py

@@ -35,7 +35,7 @@ def remote_pop(self):
 tub.listenOn("tcp:12345")
 tub.setLocation("localhost:12345")
 url = tub.registerReference(Calculator(), "calculator")
-print "the object is available at:", url
+print("the object is available at:", url)
 
 application = service.Application("pb2calculator")
 tub.setServiceParent(application)

doc/listings/pb3user.py

@@ -6,12 +6,12 @@
 
 class Observer(Referenceable):
     def remote_event(self, msg):
-        print "event:", msg
+        print("event:", msg)
 
 def printResult(number):
-    print "the result is", number
+    print("the result is", number)
 def gotError(err):
-    print "got an error:", err
+    print("got an error:", err)
 def gotRemote(remote):
     o = Observer()
     d = remote.callRemote("addObserver", observer=o)

misc/run-deprecations.py

@@ -51,7 +51,7 @@ def run_command(main):
     pw = os.environ.get("PYTHONWARNINGS")
     DDW = "default::DeprecationWarning"
     if pw != DDW:
-        print "note: $PYTHONWARNINGS is '%s', not the expected %s" % (pw, DDW)
+        print("note: $PYTHONWARNINGS is '%s', not the expected %s" % (pw, DDW))
         sys.stdout.flush()
 
     pp = RunPP()
@@ -84,11 +84,11 @@ def add(line):
     if warnings:
         if config["warnings"]:
             with open(config["warnings"], "wb") as f:
-                print >>f, "".join(warnings)
-        print "ERROR: %d deprecation warnings found" % len(warnings)
+                print("".join(warnings), flush=True)
+        print("ERROR: %d deprecation warnings found" % len(warnings))
         sys.exit(1)
 
-    print "no deprecation warnings"
+    print("no deprecation warnings")
     if signal:
         sys.exit(signal)
     sys.exit(rc)

src/foolscap/appserver/cli.py

@@ -1,4 +1,3 @@
-from __future__ import print_function, unicode_literals
 import six, os, sys, shutil, errno, time, signal
 from io import StringIO
 from twisted.python import usage

src/foolscap/appserver/client.py

@@ -1,4 +1,3 @@
-from __future__ import print_function, unicode_literals
 import six
 import os, sys
 from io import BytesIO

src/foolscap/appserver/server.py

@@ -1,4 +1,3 @@
-from __future__ import print_function, unicode_literals
 import os, sys, json, ast
 import six
 from twisted.application import service

src/foolscap/appserver/services.py

@@ -1,4 +1,3 @@
-from __future__ import unicode_literals
 import os
 import six
 from twisted.python import usage, runtime, filepath, log

src/foolscap/banana.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import six
 import struct, time
 

src/foolscap/broker.py

@@ -2,7 +2,6 @@
 
 # This module is responsible for the per-connection Broker object
 
-from __future__ import print_function
 import six
 import types, time
 from itertools import count

src/foolscap/logging/cli.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import sys
 from io import StringIO
 from twisted.python import usage

src/foolscap/logging/dumper.py

@@ -1,4 +1,3 @@
-from __future__ import print_function, unicode_literals
 import six, sys, errno, textwrap
 from twisted.python import usage
 from foolscap.logging import flogfile

src/foolscap/logging/filter.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import six
 from twisted.python import usage
 import sys, os, bz2, time

src/foolscap/logging/gatherer.py

@@ -1,4 +1,3 @@
-from __future__ import print_function, unicode_literals
 import six, os, sys, time, bz2
 signal = None
 try:

src/foolscap/logging/incident.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import six
 import sys, os.path, time, bz2
 import json

src/foolscap/logging/log.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os, sys, time, weakref, binascii
 import traceback
 import collections

src/foolscap/logging/publish.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import os
 from collections import deque
 import six

src/foolscap/logging/tail.py

@@ -1,4 +1,3 @@
-from __future__ import print_function, unicode_literals
 import six, os, sys, time
 from zope.interface import implementer
 from twisted.internet import reactor

src/foolscap/logging/web.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import time
 import six
 from six.moves.urllib.parse import quote

src/foolscap/negotiate.py

@@ -1,6 +1,5 @@
 # -*- test-case-name: foolscap.test.test_negotiate -*-
 
-from __future__ import print_function
 import time
 import six
 from twisted.python.failure import Failure

src/foolscap/referenceable.py

@@ -4,7 +4,6 @@
 # Referenceable (callable) objects. All details of actually invoking methods
 # live in call.py
 
-from __future__ import print_function
 import weakref
 from functools import total_ordering
 import six

src/foolscap/slicers/list.py

@@ -1,6 +1,5 @@
 # -*- test-case-name: foolscap.test.test_banana -*-
 
-from __future__ import print_function
 from twisted.python import log
 from twisted.internet.defer import Deferred
 from foolscap.tokens import Violation

src/foolscap/slicers/root.py

@@ -1,6 +1,5 @@
 # -*- test-case-name: foolscap.test.test_banana -*-
 
-from __future__ import print_function
 import six
 from zope.interface import implementer
 from twisted.internet.defer import Deferred

src/foolscap/slicers/set.py

@@ -1,6 +1,5 @@
 # -*- test-case-name: foolscap.test.test_banana -*-
 
-from __future__ import print_function
 from twisted.internet import defer
 from twisted.python import log
 from foolscap.slicers.list import ListSlicer

src/foolscap/slicers/tuple.py

@@ -1,6 +1,5 @@
 # -*- test-case-name: foolscap.test.test_banana -*-
 
-from __future__ import print_function
 from twisted.internet.defer import Deferred
 from foolscap.tokens import Violation
 from foolscap.slicer import BaseUnslicer

src/foolscap/test/apphelper.py

@@ -5,7 +5,6 @@
 script lets the test work on windows too.
 """
 
-from __future__ import unicode_literals
 import sys, os.path
 import six
 

src/foolscap/test/bench_banana.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import io
 from foolscap import storage
 

src/foolscap/test/check-connections-client.py

@@ -1,5 +1,4 @@
 #! /usr/bin/python
-from __future__ import print_function
 
 # This is the client side of a manual test for the socks/tor
 # connection-handler code. To use it, first set up the server as described in

src/foolscap/test/check-connections-server.py

@@ -1,7 +1,5 @@
 #! /usr/bin/python
 
-from __future__ import print_function
-
 # This is the server side of a manual test for the socks/tor
 # connection-handler code. On the server host, configure Tor to route a
 # hidden service to our port with something like:

src/foolscap/test/common.py

@@ -1,6 +1,5 @@
 # -*- test-case-name: foolscap.test.test_pb -*-
 
-from __future__ import print_function
 import six
 import time
 from zope.interface import implementer, implementer_only, implementedBy, Interface

src/foolscap/test/test__versions.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from twisted.trial import unittest
 import time
 import platform

src/foolscap/test/test_banana.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import six
 import os
 import os.path

src/foolscap/test/test_copyable.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 import six
 from twisted.trial import unittest
 from twisted.python import components, failure, reflect

src/foolscap/test/test_gifts.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 from zope.interface import implementer
 from twisted.trial import unittest
 from twisted.internet import defer, protocol, reactor

src/foolscap/test/test_interfaces.py

@@ -1,6 +1,5 @@
 # -*- test-case-name: foolscap.test.test_interfaces -*-
 
-from __future__ import print_function
 from zope.interface import implementer_only
 from twisted.trial import unittest
 

src/foolscap/test/test_pb.py

@@ -1,6 +1,5 @@
 # -*- test-case-name: foolscap.test.test_pb -*-
 
-from __future__ import print_function
 import re
 
 if False:

src/foolscap/test/test_tub.py

@@ -1,6 +1,5 @@
 # -*- test-case-name: foolscap.test.test_tub -*-
 
-from __future__ import print_function
 import os.path
 import os
 from twisted.trial import unittest