Port majority of pants/util

src/python/pants/util/BUILD

@@ -7,19 +7,22 @@ python_library(
 )
 
 python_library(
-   name = 'contextutil',
-   sources = ['contextutil.py'],
-   dependencies = [
-     '3rdparty/python:ansicolors',
-     '3rdparty/python:six',
-     ':dirutil',
-     ':tarutil',
-   ],
+  name = 'contextutil',
+  sources = ['contextutil.py'],
+  dependencies = [
+    '3rdparty/python:ansicolors',
+    '3rdparty/python:future',
+    ':dirutil',
+    ':tarutil',
+  ],
 )
 
 python_library(
   name = 'collections',
   sources = ['collections.py'],
+  dependencies = [
+    '3rdparty/python:future',
+  ]
 )
 
 python_library(
@@ -48,7 +51,7 @@ python_library(
   name = 'eval',
   sources = ['eval.py'],
   dependencies = [
-    '3rdparty/python:six',
+    '3rdparty/python:future',
   ]
 )
 
@@ -63,6 +66,9 @@ python_library(
 python_library(
   name = 'filtering',
   sources = ['filtering.py'],
+  dependencies = [
+    '3rdparty/python:future',
+  ]
 )
 
 python_library(
@@ -78,6 +84,9 @@ python_library(
 python_library(
   name = 'netrc',
   sources = ['netrc.py'],
+  dependencies = [
+    '3rdparty/python:future',
+  ]
 )
 
 python_library(
@@ -92,6 +101,9 @@ python_library(
 python_library(
   name = 'osutil',
   sources = ['osutil.py'],
+  dependencies = [
+    '3rdparty/python:future',
+  ]
 )
 
 python_library(
@@ -107,12 +119,16 @@ python_library(
 python_library(
   name = 'retry',
   sources = ['retry.py'],
+  dependencies = [
+    '3rdparty/python:future',
+  ]
 )
 
 python_library(
   name = 'rwbuf',
   sources = ['rwbuf.py'],
   dependencies = [
+    '3rdparty/python:future',
     '3rdparty/python:six',
   ]
 )
@@ -121,6 +137,7 @@ python_library(
   name = 's3_log_aggregator',
   sources = ['s3_log_aggregator.py'],
   dependencies = [
+    '3rdparty/python:future',
     '3rdparty/python:s3logparse'
   ]
 )
@@ -135,14 +152,17 @@ python_binary(
 
 python_library(
   name = 'socket',
-  sources = ['socket.py']
+  sources = ['socket.py'],
+  dependencies = [
+    '3rdparty/python:future',
+  ]
 )
 
 python_library(
   name = 'strutil',
   sources = ['strutil.py'],
   dependencies = [
-    '3rdparty/python:six',
+    '3rdparty/python:future',
   ],
 )
 

src/python/pants/util/collections.py

@@ -5,6 +5,8 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
+from builtins import next
+
 
 def combined_dict(*dicts):
   """Combine one or more dicts into a new, unified dict (dicts to the right take precedence)."""

src/python/pants/util/contextutil.py

@@ -14,10 +14,11 @@
 import time
 import uuid
 import zipfile
+from builtins import object, str
 from contextlib import closing, contextmanager
 
 from colors import green
-from six import string_types
+from future.utils import string_types
 
 from pants.util.dirutil import safe_delete
 from pants.util.tarutil import TarFile
@@ -291,7 +292,8 @@ def open_tar(path_or_file, *args, **kwargs):
     If path_or_file is a file, caller must close it separately.
   """
   (path, fileobj) = ((path_or_file, None) if isinstance(path_or_file, string_types)
-                     else (None, path_or_file))
+                     else (None, path_or_file))  # TODO(python3port): stop using six.string_types
+                                                 # This should only accept python3 `str`, not byte strings.
   with closing(TarFile.open(path, *args, fileobj=fileobj, **kwargs)) as tar:
     yield tar
 

src/python/pants/util/eval.py

@@ -5,9 +5,10 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
+from builtins import range, str
 from textwrap import dedent
 
-import six
+import future
 
 
 def parse_expression(val, acceptable_types, name=None, raise_type=ValueError):
@@ -26,7 +27,7 @@ def parse_expression(val, acceptable_types, name=None, raise_type=ValueError):
   def format_type(typ):
     return typ.__name__
 
-  if not isinstance(val, six.string_types):
+  if not isinstance(val, future.utils.string_types):
     raise raise_type('The raw `val` is not a string.  Given {} of type {}.'
                      .format(val, format_type(type(val))))
 
@@ -35,7 +36,7 @@ def get_name():
 
   def format_raw_value():
     lines = val.splitlines()
-    for line_number in six.moves.range(0, len(lines)):
+    for line_number in range(0, len(lines)):
       lines[line_number] = "{line_number:{width}}: {line}".format(
         line_number=line_number + 1,
         line=lines[line_number],

src/python/pants/util/filtering.py

@@ -49,9 +49,9 @@ def create_filter(predicate_param, predicate_factory):
   # NOTE: Do not inline this into create_filters above. A separate function is necessary
   # in order to capture the different closure on each invocation.
   modifier, param = _extract_modifier(predicate_param)
-  predicates = map(predicate_factory, param.split(','))
+  predicates = [predicate_factory(p) for p in param.split(',')]
   def filt(x):
-    return modifier(any(map(lambda pred: pred(x), predicates)))
+    return modifier(any(pred(x) for pred in predicates))
   return filt
 
 

src/python/pants/util/netrc.py

@@ -7,6 +7,7 @@
 
 import collections
 import os
+from builtins import object
 from netrc import netrc as NetrcDb
 from netrc import NetrcParseError
 

src/python/pants/util/osutil.py

@@ -9,6 +9,7 @@
 import os
 from functools import reduce
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -45,7 +46,7 @@ def get_normalized_os_name():
 
 
 def all_normalized_os_names():
-  return OS_ALIASES.keys()
+  return list(OS_ALIASES.keys())
 
 
 def known_os_names():

src/python/pants/util/retry.py

@@ -7,6 +7,7 @@
 
 import logging
 import time
+from builtins import range
 
 
 logger = logging.getLogger(__name__)

src/python/pants/util/rwbuf.py

@@ -6,6 +6,7 @@
                         unicode_literals, with_statement)
 
 import threading
+from builtins import object, str
 
 from six import StringIO
 

src/python/pants/util/s3_log_aggregator.py

@@ -7,6 +7,7 @@
 
 import os
 import sys
+from builtins import object
 from collections import defaultdict
 
 from s3logparse.s3logparse import parse_log_lines

src/python/pants/util/socket.py

@@ -9,6 +9,7 @@
 import io
 import select
 import socket
+from builtins import object
 
 
 def teardown_socket(s):

src/python/pants/util/strutil.py

@@ -8,29 +8,29 @@
 import re
 import shlex
 
-import six
+import future
 
 
 def ensure_binary(text_or_binary):
-  if isinstance(text_or_binary, six.binary_type):
+  if isinstance(text_or_binary, future.utils.binary_type):
     return text_or_binary
-  elif isinstance(text_or_binary, six.text_type):
+  elif isinstance(text_or_binary, future.utils.text_type):
     return text_or_binary.encode('utf8')
   else:
     raise TypeError('Argument is neither text nor binary type.({})'.format(type(text_or_binary)))
 
 
 def ensure_text(text_or_binary):
-  if isinstance(text_or_binary, six.binary_type):
+  if isinstance(text_or_binary, future.utils.binary_type):
     return text_or_binary.decode('utf-8')
-  elif isinstance(text_or_binary, six.text_type):
+  elif isinstance(text_or_binary, future.utils.text_type):
     return text_or_binary
   else:
     raise TypeError('Argument is neither text nor binary type ({})'.format(type(text_or_binary)))
 
 
 def is_text_or_binary(obj):
-  return isinstance(obj, (six.text_type, six.binary_type))
+  return isinstance(obj, (future.utils.text_type, future.utils.binary_type))
 
 
 def safe_shlex_split(text_or_binary):

src/python/pants/util/xml_parser.py

@@ -5,6 +5,7 @@
 from __future__ import (absolute_import, division, generators, nested_scopes, print_function,
                         unicode_literals, with_statement)
 
+from builtins import object
 from xml.dom.minidom import parse
 
 

tests/python/pants_test/util/BUILD

@@ -15,6 +15,7 @@ python_tests(
   sources = ['test_collections.py'],
   coverage = ['pants.util.collections'],
   dependencies = [
+    '3rdparty/python:future',
     'src/python/pants/util:collections',
   ]
 )
@@ -24,6 +25,7 @@ python_tests(
   sources = ['test_contextutil.py'],
   coverage = ['pants.util.contextutil'],
   dependencies = [
+    '3rdparty/python:future',
     '3rdparty/python:mock',
     'src/python/pants/util:contextutil',
     'src/python/pants/util:process_handler',
@@ -35,8 +37,8 @@ python_tests(
   sources = ['test_dirutil.py'],
   coverage = ['pants.util.dirutil'],
   dependencies = [
+    '3rdparty/python:future',
     '3rdparty/python:mock',
-    '3rdparty/python:six',
     'src/python/pants/util:contextutil',
     'src/python/pants/util:dirutil',
     'src/python/pants/util:objects',
@@ -47,7 +49,7 @@ python_tests(
   name = 'eval',
   sources = ['test_eval.py'],
   dependencies = [
-    '3rdparty/python:six',
+    '3rdparty/python:future',
     'src/python/pants/util:eval',
   ]
 )
@@ -73,6 +75,7 @@ python_tests(
   name = 'memo',
   sources = ['test_memo.py'],
   dependencies = [
+    '3rdparty/python:future',
     'src/python/pants/util:memo',
     'src/python/pants/util:meta',
   ]
@@ -91,6 +94,7 @@ python_tests(
   name = 'netrc',
   sources = ['test_netrc.py'],
   dependencies = [
+    '3rdparty/python:future',
     '3rdparty/python:mock',
     'src/python/pants/util:netrc',
   ]
@@ -110,6 +114,7 @@ python_tests(
   name = 'osutil',
   sources = ['test_osutil.py'],
   dependencies = [
+    '3rdparty/python:future',
     'src/python/pants/util:osutil',
     'tests/python/pants_test:test_base',
   ]
@@ -146,6 +151,7 @@ python_tests(
   name = 'strutil',
   sources = ['test_strutil.py'],
   dependencies = [
+    '3rdparty/python:future',
     'src/python/pants/util:strutil',
   ]
 )

tests/python/pants_test/util/test_collections.py

@@ -6,6 +6,7 @@
                         unicode_literals, with_statement)
 
 import unittest
+from builtins import str
 
 from pants.util.collections import assert_single_element, combined_dict, recursively_update
 

tests/python/pants_test/util/test_contextutil.py

@@ -13,6 +13,7 @@
 import unittest
 import uuid
 import zipfile
+from builtins import next, object, range, str
 from contextlib import contextmanager
 
 import mock

tests/python/pants_test/util/test_dirutil.py

@@ -11,8 +11,8 @@
 import unittest
 from contextlib import contextmanager
 
+import future
 import mock
-import six
 
 from pants.util import dirutil
 from pants.util.contextutil import pushd, temporary_dir
@@ -120,10 +120,10 @@ def test_safe_walk(self):
     # unicode constructor.
     with temporary_dir() as tmpdir:
       safe_mkdir(os.path.join(tmpdir, '中文'))
-      if isinstance(tmpdir, six.text_type):
+      if isinstance(tmpdir, future.utils.text_type):
         tmpdir = tmpdir.encode('utf-8')
       for _, dirs, _ in dirutil.safe_walk(tmpdir):
-        self.assertTrue(all(isinstance(dirname, six.text_type) for dirname in dirs))
+        self.assertTrue(all(isinstance(dirname, future.utils.text_type) for dirname in dirs))
 
   @contextmanager
   def tree(self):