Port pantsd/ to python3 (#6136)

src/python/pants/pantsd/BUILD

@@ -5,6 +5,7 @@ python_library(
   name = 'process_manager',
   sources = ['process_manager.py'],
   dependencies = [
+    '3rdparty/python:future',
     '3rdparty/python:psutil',
     'src/python/pants/base:build_environment',
     'src/python/pants/process',
@@ -28,6 +29,7 @@ python_library(
   name = 'watchman',
   sources = ['watchman.py'],
   dependencies = [
+    '3rdparty/python:future',
     'src/python/pants/util:dirutil',
     'src/python/pants/util:retry',
     ':process_manager',
@@ -39,6 +41,7 @@ python_library(
   name = 'watchman_launcher',
   sources = ['watchman_launcher.py'],
   dependencies = [
+    '3rdparty/python:future',
     ':watchman',
     'src/python/pants/binaries',
     'src/python/pants/util:memo',
@@ -57,6 +60,7 @@ python_library(
   name = 'pants_daemon',
   sources = ['pants_daemon.py'],
   dependencies = [
+    '3rdparty/python:future',
     '3rdparty/python:setproctitle',
     'src/python/pants/base:build_environment',
     'src/python/pants/base:exiter',

src/python/pants/pantsd/pants_daemon.py

@@ -8,6 +8,7 @@
 import os
 import sys
 import threading
+from builtins import object
 from contextlib import contextmanager
 
 from setproctitle import setproctitle as set_process_title

src/python/pants/pantsd/process_manager.py

@@ -9,6 +9,7 @@
 import signal
 import time
 import traceback
+from builtins import object, str
 from contextlib import contextmanager
 
 import psutil

src/python/pants/pantsd/service/BUILD

@@ -32,6 +32,7 @@ python_library(
   name = 'scheduler_service',
   sources = ['scheduler_service.py'],
   dependencies = [
+    '3rdparty/python:future',
     '3rdparty/python/twitter/commons:twitter.common.dirutil',
     ':pants_service'
   ]
@@ -41,6 +42,7 @@ python_library(
   name = 'store_gc_service',
   sources = ['store_gc_service.py'],
   dependencies = [
+    '3rdparty/python:future',
     ':pants_service',
   ]
 )

src/python/pants/pantsd/service/fs_event_service.py

@@ -130,7 +130,7 @@ def run(self):
 
     futures = {}
     id_counter = 0
-    subscriptions = self._handlers.values()
+    subscriptions = list(self._handlers.values())
 
     # Setup subscriptions and begin the main event firing loop.
     for handler_name, event_data in self._watchman.subscribed(self._build_root, subscriptions):

src/python/pants/pantsd/service/scheduler_service.py

@@ -6,7 +6,7 @@
 
 import logging
 import os
-import Queue
+import queue
 import threading
 
 from twitter.common.dirutil import Fileset
@@ -52,7 +52,7 @@ def __init__(
 
     self._scheduler = legacy_graph_scheduler.scheduler
     self._logger = logging.getLogger(__name__)
-    self._event_queue = Queue.Queue(maxsize=self.QUEUE_SIZE)
+    self._event_queue = queue.Queue(maxsize=self.QUEUE_SIZE)
     self._watchman_is_running = threading.Event()
     self._invalidating_files = set()
 
@@ -125,7 +125,7 @@ def _process_event_queue(self):
     """File event notification queue processor."""
     try:
       event = self._event_queue.get(timeout=1)
-    except Queue.Empty:
+    except queue.Empty:
       return
 
     try:

src/python/pants/pantsd/watchman.py

@@ -8,6 +8,7 @@
 import json
 import logging
 import os
+from builtins import str
 from collections import namedtuple
 
 from pants.pantsd.process_manager import ProcessManager

src/python/pants/pantsd/watchman_launcher.py

@@ -5,6 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import logging
+from builtins import object
 
 from pants.binaries.binary_util import BinaryToolFetcher, BinaryUtil
 from pants.pantsd.watchman import Watchman

tests/python/pants_test/pantsd/BUILD

@@ -45,6 +45,7 @@ python_tests(
   sources = ['test_pailgun_server.py'],
   coverage = ['pants.pantsd.pailgun_server'],
   dependencies = [
+    '3rdparty/python:future',
     ':test_deps',
     'src/python/pants/pantsd:pailgun_server'
   ]

tests/python/pants_test/pantsd/service/BUILD

@@ -16,6 +16,7 @@ python_tests(
   sources = ['test_fs_event_service.py'],
   coverage = ['pants.pantsd.service.fs_event_service'],
   dependencies = [
+    '3rdparty/python:future',
     'tests/python/pants_test/pantsd:test_deps',
     'src/python/pants/pantsd/service:fs_event_service'
   ]
@@ -26,6 +27,7 @@ python_tests(
   sources = ['test_pailgun_service.py'],
   coverage = ['pants.pantsd.service.pailgun_service'],
   dependencies = [
+    '3rdparty/python:future',
     'tests/python/pants_test/pantsd:test_deps',
     'src/python/pants/pantsd/service:pailgun_service'
   ]

tests/python/pants_test/pantsd/service/test_fs_event_service.py

@@ -4,6 +4,7 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+from builtins import object
 from collections import namedtuple
 from contextlib import contextmanager
 

tests/python/pants_test/pantsd/service/test_pailgun_service.py

@@ -5,6 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import unittest
+from builtins import object
 
 import mock
 

tests/python/pants_test/pantsd/test_pailgun_server.py

@@ -8,7 +8,7 @@
 import threading
 import unittest
 from contextlib import contextmanager
-from SocketServer import TCPServer
+from socketserver import TCPServer
 
 import mock
 
@@ -81,7 +81,7 @@ def test_handle_error(self):
     self.handler.handle_error()
     last_chunk_type, last_payload = list(NailgunProtocol.iter_chunks(self.client_sock))[-1]
     self.assertEquals(last_chunk_type, ChunkType.EXIT)
-    self.assertEquals(bytes(last_payload), '1')
+    self.assertEquals(last_payload, '1')
 
   @mock.patch.object(PailgunHandler, '_run_pants', **PATCH_OPTS)
   def test_handle_request(self, mock_run_pants):

tests/python/pants_test/pantsd/test_pantsd_integration.py

@@ -10,6 +10,7 @@
 import signal
 import threading
 import time
+from builtins import range, zip
 from concurrent.futures import ThreadPoolExecutor
 from contextlib import contextmanager