include_server python(3) readypython3

1 files changed, 14 insertions, 14 deletions

diff --git a/include_server/include_server_test.py b/include_server/include_server_test.py
index c1f4a8e..c0b88e3 100755
--- a/include_server/include_server_test.py
+++ b/include_server/include_server_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.4
+#!/usr/bin/env python3
 
 # Copyright 2007 Google Inc.
 #
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
 # USA.
- 
+
 """Exercise include server handler with respect to exceptions and email.
 
 To do this, we mock out socket servers, c_extensions, email handling, and even
@@ -69,7 +69,7 @@ class IncludeServerTest(unittest.TestCase):
     old_XArgv = distcc_pump_c_extensions.XArgv
     distcc_pump_c_extensions.XArgv = lambda _, __: None
     old_StreamRequestHandler = (
-      include_server.SocketServer.StreamRequestHandler)
+      include_server.socketserver.StreamRequestHandler)
 
     class Mock_StreamRequestHandler(object):
       def __init__(self):
@@ -78,7 +78,7 @@ class IncludeServerTest(unittest.TestCase):
         self.wfile = lambda: None
         self.wfile.fileno = lambda: 27
 
-    include_server.SocketServer.StreamRequestHandler = (
+    include_server.socketserver.StreamRequestHandler = (
       Mock_StreamRequestHandler)
 
     include_analyzer = (
@@ -111,7 +111,7 @@ class IncludeServerTest(unittest.TestCase):
     distcc_pump_c_extensions.RCwd = lambda self: os.getcwd()
 
     def Expect1(txt, force, never):
-      self_test.assert_(
+      self_test.assertTrue(
         "Include server not covering: " +
         "Could not find translation unit 'parse.c'" in txt, txt)
       self_test.assertEqual(never, True)
@@ -124,6 +124,7 @@ class IncludeServerTest(unittest.TestCase):
     else:
       raise AssertionError
 
+
     # Exercise 2: provoke assertion error in cache_basics by providing an
     # entirely false value of current directory as provided in RCwd.
 
@@ -136,18 +137,17 @@ class IncludeServerTest(unittest.TestCase):
     # mock out, in a sense, the provoked assertion exception that we
     # expect. The variable got_here allows us to filter the provoked exception
     # away from unexpected ones.
-    got_here = []  
+    got_here = []
 
     def Expect2(txt, force, never):
-      self_test.assert_("Include server internal error" in txt, txt)
-      self_test.assert_("exceptions.AssertionError" in txt, txt)
-      self_test.assert_("for translation unit 'parse.c'" in txt, txt)
+      got_here.append(True)
+      self_test.assertTrue("Include server internal error" in txt, txt)
+      self_test.assertTrue("exceptions.AssertionError" in txt, txt)
+      self_test.assertTrue("for translation unit 'parse.c'" in txt, txt)
 
       # This email should be sent.
       self_test.assertEqual(never, False)
 
-      got_here.append(True)
-
     mock_email_sender.expect = Expect2
     try:
       include_handler.handle()
@@ -155,7 +155,7 @@ class IncludeServerTest(unittest.TestCase):
       os.chdir(oldcwd)
       # Make sure that we're catching the induced AssertionError, not one
       # produced in Except2.
-      self.assert_(got_here)
+      self.assertTrue(got_here)
     else:
       raise AssertionError
 
@@ -166,7 +166,7 @@ class IncludeServerTest(unittest.TestCase):
     distcc_pump_c_extensions.RCwd = lambda self: os.getcwd()
 
     def Expect3(txt, force, never):
-      self_test.assert_(
+      self_test.assertTrue(
         "Filepath must be relative but isn't: '/love/of/my/life'."
         in txt, txt)
       # Now check that this email is scheduled to not be sent.
@@ -181,7 +181,7 @@ class IncludeServerTest(unittest.TestCase):
     distcc_pump_c_extensions.RWcd = old_RWcd
     distcc_pump_c_extensions.RArgv = old_RArgv
     distcc_pump_c_extensions.XArgv = old_XArgv
-    include_server.SocketServer.StreamRequestHandler = (
+    include_server.socketserver.StreamRequestHandler = (
       old_StreamRequestHandler)
 
 unittest.main()