launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #25673
[Merge] ~cjwatson/launchpad:py3-librarianserver-test-doc into launchpad:master
Colin Watson has proposed merging ~cjwatson/launchpad:py3-librarianserver-test-doc into launchpad:master.
Commit message:
Port lp.services.librarianserver.tests.test_doc to print_function
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/393783
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:py3-librarianserver-test-doc into launchpad:master.
diff --git a/lib/lp/services/librarianserver/tests/test_doc.py b/lib/lp/services/librarianserver/tests/test_doc.py
index 471f231..ff7ea00 100644
--- a/lib/lp/services/librarianserver/tests/test_doc.py
+++ b/lib/lp/services/librarianserver/tests/test_doc.py
@@ -5,6 +5,8 @@
Run the doctests and pagetests.
"""
+from __future__ import absolute_import, print_function
+
__metaclass__ = type
import os
@@ -91,7 +93,7 @@ def upload_request(request):
from twisted.python import log
def log_observer(x):
- print >> sys.stderr, x
+ print(x, file=sys.stderr)
if 'failure' in x:
x['failure'].printTraceback(file=sys.stderr)
@@ -116,15 +118,15 @@ def upload_request(request):
server.dataReceived(request.replace('\n', '\r\n'))
# Report on what happened
- print "reply: %r" % server.transport.bytesWritten.rstrip('\r\n')
+ print("reply: %r" % server.transport.bytesWritten.rstrip('\r\n'))
if server.transport.connectionLost:
- print 'connection closed'
+ print('connection closed')
mockFile = server.fileLibrary.file
if mockFile is not None and mockFile.stored:
- print "file %r stored as %s, contents: %r" % (
- mockFile.name, mockFile.mimetype, mockFile.bytes)
+ print("file %r stored as %s, contents: %r" %
+ (mockFile.name, mockFile.mimetype, mockFile.bytes))
# Cleanup: remove the observer.
log.removeObserver(log_observer)