Merge pull request #40 from alex/print-stmt-py3k

Converted print statements to use the Python3 compatible form

2 files changed, 85 insertions, 63 deletions

diff --git a/memcache.py b/memcache.py
index d59738f..7e33c84 100644
--- a/memcache.py
+++ b/memcache.py
@@ -43,6 +43,8 @@ Detailed Documentation
 More detailed documentation is available in the L{Client} class.
 """
 
+from __future__ import print_function
+
 import sys
 import socket
 import time
@@ -1260,10 +1262,10 @@ def _doctest():
 
 if __name__ == "__main__":
     failures = 0
-    print "Testing docstrings..."
+    print("Testing docstrings...")
     _doctest()
-    print "Running tests:"
-    print
+    print("Running tests:")
+    print()
     serverList = [["127.0.0.1:11211"]]
     if '--do-unix' in sys.argv:
         serverList.append([os.path.join(os.getcwd(), 'memcached.socket')])
@@ -1277,14 +1279,15 @@ if __name__ == "__main__":
             return "%s" % val
         def test_setget(key, val):
             global failures
-            print "Testing set/get {'%s': %s} ..." % (to_s(key), to_s(val)),
+            print("Testing set/get {'%s': %s} ..." % (to_s(key), to_s(val)), end=" ")
             mc.set(key, val)
             newval = mc.get(key)
             if newval == val:
-                print "OK"
+                print("OK")
                 return 1
             else:
-                print "FAIL"; failures = failures + 1
+                print("FAIL")
+                failures += 1
                 return 0
 
 
@@ -1301,138 +1304,155 @@ if __name__ == "__main__":
         test_setget("a_string", "some random string")
         test_setget("an_integer", 42)
         if test_setget("long", long(1<<30)):
-            print "Testing delete ...",
+            print("Testing delete ...", end=" ")
             if mc.delete("long"):
-                print "OK"
+                print("OK")
             else:
-                print "FAIL"; failures = failures + 1
-            print "Checking results of delete ..."
+                print("FAIL")
+                failures += 1
+            print("Checking results of delete ...", end=" ")
             if mc.get("long") == None:
-                print "OK"
+                print("OK")
             else:
-                print "FAIL"; failures = failures + 1
-        print "Testing get_multi ...",
-        print mc.get_multi(["a_string", "an_integer"])
+                print("FAIL")
+                failures += 1
+        print("Testing get_multi ...",)
+        print(mc.get_multi(["a_string", "an_integer"]))
 
         #  removed from the protocol
         #if test_setget("timed_delete", 'foo'):
         #    print "Testing timed delete ...",
         #    if mc.delete("timed_delete", 1):
-        #        print "OK"
+        #        print("OK")
         #    else:
-        #        print "FAIL"; failures = failures + 1
+        #        print("FAIL")
+        #        failures += 1
         #    print "Checking results of timed delete ..."
         #    if mc.get("timed_delete") == None:
-        #        print "OK"
+        #        print("OK")
         #    else:
-        #        print "FAIL"; failures = failures + 1
+        #        print("FAIL")
+        #        failures += 1
 
-        print "Testing get(unknown value) ...",
-        print to_s(mc.get("unknown_value"))
+        print("Testing get(unknown value) ...", end=" ")
+        print(to_s(mc.get("unknown_value")))
 
         f = FooStruct()
         test_setget("foostruct", f)
 
-        print "Testing incr ...",
+        print("Testing incr ...", end=" ")
         x = mc.incr("an_integer", 1)
         if x == 43:
-            print "OK"
+            print("OK")
         else:
-            print "FAIL"; failures = failures + 1
+            print("FAIL")
+            failures += 1
 
-        print "Testing decr ...",
+        print("Testing decr ...", end=" ")
         x = mc.decr("an_integer", 1)
         if x == 42:
-            print "OK"
+            print("OK")
         else:
-            print "FAIL"; failures = failures + 1
+            print("FAIL")
+            failures += 1
         sys.stdout.flush()
 
         # sanity tests
-        print "Testing sending spaces...",
+        print("Testing sending spaces...", end=" ")
         sys.stdout.flush()
         try:
             x = mc.set("this has spaces", 1)
         except Client.MemcachedKeyCharacterError as msg:
-            print "OK"
+            print("OK")
         else:
-            print "FAIL"; failures = failures + 1
+            print("FAIL")
+            failures += 1
 
-        print "Testing sending control characters...",
+        print("Testing sending control characters...", end=" ")
         try:
             x = mc.set("this\x10has\x11control characters\x02", 1)
         except Client.MemcachedKeyCharacterError as msg:
-            print "OK"
+            print("OK")
         else:
-            print "FAIL"; failures = failures + 1
+            print("FAIL")
+            failures += 1
 
-        print "Testing using insanely long key...",
+        print("Testing using insanely long key...", end=" ")
         try:
             x = mc.set('a'*SERVER_MAX_KEY_LENGTH, 1)
         except Client.MemcachedKeyLengthError as msg:
-            print "FAIL"; failures = failures + 1
+            print("FAIL")
+            failures += 1
         else:
-            print "OK"
+            print("OK")
         try:
             x = mc.set('a'*SERVER_MAX_KEY_LENGTH + 'a', 1)
         except Client.MemcachedKeyLengthError as msg:
-            print "OK"
+            print("OK")
         else:
-            print "FAIL"; failures = failures + 1
+            print("FAIL")
+            failures += 1
 
-        print "Testing sending a unicode-string key...",
+        print("Testing sending a unicode-string key...", end=" ")
         try:
             x = mc.set(unicode('keyhere'), 1)
         except Client.MemcachedStringEncodingError as msg:
-            print "OK",
+            print("OK", end=" ")
         else:
-            print "FAIL",; failures = failures + 1
+            print("FAIL", end=" ")
+            failures += 1
         try:
             x = mc.set((unicode('a')*SERVER_MAX_KEY_LENGTH).encode('utf-8'), 1)
         except:
-            print "FAIL",; failures = failures + 1
+            print("FAIL", end=" ")
+            failures += 1
         else:
-            print "OK",
+            print("OK", end=" ")
         import pickle
         s = pickle.loads('V\\u4f1a\np0\n.')
         try:
             x = mc.set((s*SERVER_MAX_KEY_LENGTH).encode('utf-8'), 1)
         except Client.MemcachedKeyLengthError:
-            print "OK"
+            print("OK")
         else:
-            print "FAIL"; failures = failures + 1
+            print("FAIL")
+            failures += 1
 
-        print "Testing using a value larger than the memcached value limit..."
-        print 'NOTE: "MemCached: while expecting[...]" is normal...'
+        print("Testing using a value larger than the memcached value limit...")
+        print('NOTE: "MemCached: while expecting[...]" is normal...')
         x = mc.set('keyhere', 'a'*SERVER_MAX_VALUE_LENGTH)
         if mc.get('keyhere') == None:
-            print "OK",
+            print("OK", end=" ")
         else:
-            print "FAIL",; failures = failures + 1
+            print("FAIL", end=" ")
+            failures += 1
         x = mc.set('keyhere', 'a'*SERVER_MAX_VALUE_LENGTH + 'aaa')
         if mc.get('keyhere') == None:
-            print "OK"
+            print("OK")
         else:
-            print "FAIL"; failures = failures + 1
+            print("FAIL")
+            failures += 1
 
-        print "Testing set_multi() with no memcacheds running",
+        print("Testing set_multi() with no memcacheds running", end=" ")
         mc.disconnect_all()
         errors = mc.set_multi({'keyhere' : 'a', 'keythere' : 'b'})
         if errors != []:
-            print "FAIL"; failures = failures + 1
+            print("FAIL")
+            failures += 1
         else:
-            print "OK"
+            print("OK")
 
-        print "Testing delete_multi() with no memcacheds running",
+        print("Testing delete_multi() with no memcacheds running", end=" ")
         mc.disconnect_all()
         ret = mc.delete_multi({'keyhere' : 'a', 'keythere' : 'b'})
         if ret != 1:
-            print "FAIL"; failures = failures + 1
+            print("FAIL")
+            failures += 1
         else:
-            print "OK"
+            print("OK")
 
     if failures > 0:
-        print '*** THERE WERE FAILED TESTS'
+        print('*** THERE WERE FAILED TESTS')
         sys.exit(1)
     sys.exit(0)
 
diff --git a/tests/test_setmulti.py b/tests/test_setmulti.py
index 5947639..b6b2805 100644
--- a/tests/test_setmulti.py
+++ b/tests/test_setmulti.py
@@ -7,6 +7,8 @@
 #
 #     https://github.com/linsomniac/python-unittest-skeleton
 
+from __future__ import print_function
+
 import unittest
 
 import sys
@@ -24,16 +26,16 @@ class test_Memcached_Set_Multi(unittest.TestCase):
         class FakeSocket(object):
             def __init__(self, *args):
                 if DEBUG:
-                    print 'FakeSocket{0!r}'.format(args)
+                    print('FakeSocket{0!r}'.format(args))
                 self._recv_chunks = list(RECV_CHUNKS)
 
             def connect(self, *args):
                 if DEBUG:
-                    print 'FakeSocket.connect{0!r}'.format(args)
+                    print('FakeSocket.connect{0!r}'.format(args))
 
             def sendall(self, *args):
                 if DEBUG:
-                    print 'FakeSocket.sendall{0!r}'.format(args)
+                    print('FakeSocket.sendall{0!r}'.format(args))
 
             def recv(self, *args):
                 if self._recv_chunks:
@@ -41,12 +43,12 @@ class test_Memcached_Set_Multi(unittest.TestCase):
                 else:
                     data = ''
                 if DEBUG:
-                    print 'FakeSocket.recv{0!r} -> {1!r}'.format(args, data)
+                    print('FakeSocket.recv{0!r} -> {1!r}'.format(args, data))
                 return data
 
             def close(self):
                 if DEBUG:
-                    print 'FakeSocket.close()'
+                    print('FakeSocket.close()')
 
         self.old_socket = socket.socket
         socket.socket = FakeSocket
@@ -62,7 +64,7 @@ class test_Memcached_Set_Multi(unittest.TestCase):
         self.assertEqual(sorted(bad_keys), ['bar', 'foo'])
 
         if DEBUG:
-            print 'set_multi({0!r}) -> {1!r}'.format(mapping, bad_keys)
+            print('set_multi({0!r}) -> {1!r}'.format(mapping, bad_keys))
 
 if __name__ == '__main__':
     unittest.main()