Port go to py3 (pantsbuild#6139)

### Problem Upgrading go to be compat w/py3 ### Solution Very few, script handled 100% but I did revert a couple of excess lists.
twitter · Jul 17, 2018 · 68bbe91 · 68bbe91
1 parent 6c41ecf
commit 68bbe91
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -29,3 +29,4 @@ At a minimum, pants requires the following to run properly:
 Additionally, if you use the jvm backend to work with java or scala code (installed by default):
 
 * OpenJDK or Oracle JDK version 7 or greater
+
diff --git a/contrib/go/src/python/pants/contrib/go/subsystems/BUILD b/contrib/go/src/python/pants/contrib/go/subsystems/BUILD
@@ -3,6 +3,7 @@
 
 python_library(
   dependencies=[
+    '3rdparty/python:future',
     '3rdparty/python:requests',
     '3rdparty/python:pyopenssl',
     '3rdparty/python:six',

diff --git a/contrib/go/src/python/pants/contrib/go/subsystems/go_distribution.py b/contrib/go/src/python/pants/contrib/go/subsystems/go_distribution.py
@@ -5,6 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import os
+from builtins import str
 from collections import OrderedDict, namedtuple
 
 from pants.base.workunit import WorkUnit, WorkUnitLabel

diff --git a/contrib/go/src/python/pants/contrib/go/targets/BUILD b/contrib/go/src/python/pants/contrib/go/targets/BUILD
@@ -1,5 +1,6 @@
 python_library(
   dependencies=[
+    '3rdparty/python:future',
     'src/python/pants/base:build_environment',
     'src/python/pants/base:deprecated',
     'src/python/pants/base:exceptions',

diff --git a/contrib/go/src/python/pants/contrib/go/targets/go_remote_library.py b/contrib/go/src/python/pants/contrib/go/targets/go_remote_library.py
@@ -5,6 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import os
+from builtins import str
 
 from pants.base.exceptions import TargetDefinitionException
 from pants.base.payload import Payload

diff --git a/contrib/go/src/python/pants/contrib/go/tasks/BUILD b/contrib/go/src/python/pants/contrib/go/tasks/BUILD
@@ -4,6 +4,7 @@
 python_library(
   sources=globs('*.py'),  # Need explicit sources, because `go_test.py` won't match the default.
   dependencies=[
+    '3rdparty/python:future',
     '3rdparty/python/twitter/commons:twitter.common.collections',
     '3rdparty/python:ansicolors',
     'contrib/go/src/python/pants/contrib/go/subsystems',

diff --git a/contrib/go/src/python/pants/contrib/go/tasks/go_binary_fingerprint_strategy.py b/contrib/go/src/python/pants/contrib/go/tasks/go_binary_fingerprint_strategy.py
@@ -5,6 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import hashlib
+from builtins import str
 
 from pants.base.fingerprint_strategy import FingerprintStrategy
 

diff --git a/contrib/go/src/python/pants/contrib/go/tasks/go_buildgen.py b/contrib/go/src/python/pants/contrib/go/tasks/go_buildgen.py
@@ -5,6 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import os
+from builtins import object, str
 from collections import defaultdict, namedtuple
 from textwrap import dedent
 
@@ -61,7 +62,7 @@ def generate(self, local_go_targets):
       for local_go_target in local_go_targets:
         deps = self._list_deps(gopath, local_go_target.address)
         self._generate_missing(gopath, local_go_target.address, deps, visited)
-    return visited.items()
+    return list(visited.items())
 
   def _generate_missing(self, gopath, local_address, import_listing, visited):
     target_type = GoBinary if import_listing.pkg_name == 'main' else GoLibrary

diff --git a/contrib/go/src/python/pants/contrib/go/tasks/go_task.py b/contrib/go/src/python/pants/contrib/go/tasks/go_task.py
@@ -6,6 +6,7 @@
 
 import json
 import re
+from builtins import object, str
 from collections import namedtuple
 
 from pants.base.workunit import WorkUnit, WorkUnitLabel

diff --git a/contrib/go/src/python/pants/contrib/go/tasks/go_test.py b/contrib/go/src/python/pants/contrib/go/tasks/go_test.py
@@ -4,6 +4,8 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
+from builtins import filter
+
 from pants.base.exceptions import TaskError
 from pants.base.workunit import WorkUnitLabel
 

diff --git a/contrib/go/src/python/pants/contrib/go/tasks/go_workspace_task.py b/contrib/go/src/python/pants/contrib/go/tasks/go_workspace_task.py
@@ -5,6 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import os
+from builtins import zip
 from itertools import chain
 
 from pants.base.build_environment import get_buildroot

diff --git a/contrib/go/tests/python/pants_test/contrib/go/subsystems/BUILD b/contrib/go/tests/python/pants_test/contrib/go/subsystems/BUILD
@@ -15,6 +15,7 @@ python_tests(
   name='go_distribution',
   sources=['test_go_distribution.py'],
   dependencies=[
+    '3rdparty/python:future',
     'contrib/go/src/python/pants/contrib/go/subsystems',
     'src/python/pants/util:contextutil',
     'src/python/pants/util:process_handler',

diff --git a/contrib/go/tests/python/pants_test/contrib/go/subsystems/test_go_distribution.py b/contrib/go/tests/python/pants_test/contrib/go/subsystems/test_go_distribution.py
@@ -6,6 +6,7 @@
 
 import os
 import unittest
+from builtins import str
 
 from pants.util.contextutil import environment_as
 from pants.util.process_handler import subprocess

diff --git a/contrib/go/tests/python/pants_test/contrib/go/tasks/BUILD b/contrib/go/tests/python/pants_test/contrib/go/tasks/BUILD
@@ -4,6 +4,7 @@
 python_tests(
   sources = globs('*.py', exclude=[globs('*_integration.py')]),
   dependencies=[
+    '3rdparty/python:future',
     'contrib/go/src/python/pants/contrib/go/subsystems',
     'contrib/go/src/python/pants/contrib/go/targets',
     'contrib/go/src/python/pants/contrib/go/tasks',

diff --git a/contrib/go/tests/python/pants_test/contrib/go/tasks/test_go_buildgen.py b/contrib/go/tests/python/pants_test/contrib/go/tasks/test_go_buildgen.py
@@ -5,6 +5,7 @@
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import types
+from builtins import object
 from textwrap import dedent
 
 from pants.build_graph.target import Target