Merge pull request kubernetes-sigs#647 from mboersma/python-doc-update

📖 clarify that either python 2.7 or 3.x is ok

Author: k8s-ci-robot

.gitignore

@@ -56,3 +56,7 @@ tilt-settings.json
 test/e2e/junit.e2e_suite.*.xml
 test/e2e/logs/*
 _artifacts
+
+# boilerplate_test output
+hack/boilerplate/__pycache__
+hack/boilerplate/*.pyc

docs/development.md

@@ -55,7 +55,7 @@
    - `brew install kustomize` on macOS.
    - `choco install kustomize` on Windows.
    - [install instructions][kustomizelinux] on Linux
-6. Configure Python 2.7+ with [pyenv][pyenv] if your default is Python 3.x.
+6. Install Python 3.x or 2.7.x, if neither is already installed.
 7. Install make.
 8. Install [timeout][timeout]
    - `brew install coreutils` on macOS.
@@ -388,7 +388,6 @@ export SKIP_UPSTREAM_E2E_TESTS="false"
 [kind]: https://sigs.k8s.io/kind
 [azure_cli]: https://docs.microsoft.com/en-us/cli/azure/install-azure-cli?view=azure-cli-latest
 [manifests]: /docs/manifests.md
-[pyenv]: https://github.com/pyenv/pyenv
 [kustomize]: https://github.com/kubernetes-sigs/kustomize
 [kustomizelinux]: https://github.com/kubernetes-sigs/kustomize/blob/master/docs/INSTALL.md
 [gomock]: https://github.com/golang/mock

hack/boilerplate/boilerplate.py

@@ -218,6 +218,8 @@ def main():
 
     for filename in filenames:
         if not file_passes(filename, refs, regexs):
+            if sys.version_info[0] < 3:
+                filename = unicode(filename)
             print(filename, file=sys.stdout)
 
     return 0

hack/boilerplate/boilerplate_test.py

@@ -16,7 +16,7 @@
 
 import boilerplate
 import unittest
-import StringIO
+from io import StringIO
 import os
 import sys
 
@@ -39,7 +39,7 @@ def __init__(self):
 
     # capture stdout
     old_stdout = sys.stdout
-    sys.stdout = StringIO.StringIO()
+    sys.stdout = StringIO()
 
     boilerplate.args = Args()
     ret = boilerplate.main()
@@ -48,5 +48,5 @@ def __init__(self):
 
     sys.stdout = old_stdout
 
-    self.assertEquals(
+    self.assertEqual(
         output, ['././fail.go', '././fail.py'])