use python3, python2 is deprecated

Signed-off-by: cpanato <ctadeu@gmail.com>
kubernetes-sigs · Jan 27, 2023 · 074ad49 · 074ad49
1 parent 7fe1831
commit 074ad49
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/docs/book/src/developers/development.md b/docs/book/src/developers/development.md
@@ -19,7 +19,7 @@
 5. Install [Kustomize][kustomize]
    - `brew install kustomize` on macOS.
    - [install instructions](https://kubectl.docs.kubernetes.io/installation/kustomize/) on Windows + WSL2, Linux and macOS.
-6. Install Python 3.x or 2.7.x, if neither is already installed.
+6. Install Python 3.x, if neither is already installed.
 7. Install make.
    - `brew install make` on MacOS.
    - `sudo apt install make` on Windows + WSL2.

diff --git a/hack/boilerplate/boilerplate.py.txt b/hack/boilerplate/boilerplate.py.txt
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright YEAR The Kubernetes Authors.
 #

diff --git a/hack/boilerplate/boilerplate_test.py b/hack/boilerplate/boilerplate_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2016 The Kubernetes Authors.
 #

diff --git a/hack/boilerplate/test/fail.py b/hack/boilerplate/test/fail.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2015 The Kubernetes Authors.
 #

diff --git a/hack/boilerplate/test/pass.py b/hack/boilerplate/test/pass.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2015 The Kubernetes Authors.
 #

diff --git a/hack/checkin_account.py b/hack/checkin_account.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2019 The Kubernetes Authors.
 #

diff --git a/hack/checkout_account.py b/hack/checkout_account.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2019 The Kubernetes Authors.
 #
@@ -16,8 +16,8 @@
 
 """Checks out a gcp account from E2E"""
 
-import urllib
-import httplib
+from urllib.parse import urlencode
+import http.client as httplib
 import os
 import sys
 import json
@@ -29,7 +29,7 @@
 
 def post_request(host, input_state = "clean"):
     conn = httplib.HTTPConnection(host)
-    conn.request("POST", "/acquire?%s" % urllib.urlencode({
+    conn.request("POST", "/acquire?%s" % urlencode({
         'type': RESOURCE_TYPE,
         'owner': USER,
         'state': input_state,
@@ -56,5 +56,5 @@ def post_request(host, input_state = "clean"):
         sys.exit("Got invalid response %d: %s" % (status, reason))
 
     body = json.loads(result)
-    print 'export BOSKOS_RESOURCE_NAME="%s";' % body['name']
-    print 'export GCP_PROJECT="%s";' % body['name']
+    print('export BOSKOS_RESOURCE_NAME="%s";' % body['name'])
+    print('export GCP_PROJECT="%s";' % body['name'])
diff --git a/hack/heartbeat_account.py b/hack/heartbeat_account.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Copyright 2019 The Kubernetes Authors.
 #

diff --git a/scripts/ci-conformance.sh b/scripts/ci-conformance.sh
@@ -212,7 +212,7 @@ main() {
     # Check out the account from Boskos and store the produced environment
     # variables in a temporary file.
     account_env_var_file="$(mktemp)"
-    python hack/checkout_account.py 1>"${account_env_var_file}"
+    python3 hack/checkout_account.py 1>"${account_env_var_file}"
     checkout_account_status="${?}"
 
     # If the checkout process was a success then load the account's
@@ -231,7 +231,7 @@ main() {
 
     # run the heart beat process to tell boskos that we are still
     # using the checked out account periodically
-    python -u hack/heartbeat_account.py >> "$ARTIFACTS/logs/boskos.log" 2>&1 &
+    python3 -u hack/heartbeat_account.py >> "$ARTIFACTS/logs/boskos.log" 2>&1 &
     # shellcheck disable=SC2116
     HEART_BEAT_PID=$(echo $!)
   fi

diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
@@ -172,7 +172,7 @@ cleanup() {
   fi
 
   # stop boskos heartbeat
-  [[ -z ${HEART_BEAT_PID:-} ]] || kill -9 "${HEART_BEAT_PID}" || true
+  kill -9 "${HEART_BEAT_PID}" || true
 }
 
 # our exit handler (trap)
@@ -205,7 +205,7 @@ main() {
     # Check out the account from Boskos and store the produced environment
     # variables in a temporary file.
     account_env_var_file="$(mktemp)"
-    python hack/checkout_account.py 1>"${account_env_var_file}"
+    python3 hack/checkout_account.py 1>"${account_env_var_file}"
     checkout_account_status="${?}"
 
     # If the checkout process was a success then load the account's
@@ -224,7 +224,7 @@ main() {
 
     # run the heart beat process to tell boskos that we are still
     # using the checked out account periodically
-    python -u hack/heartbeat_account.py >> "$ARTIFACTS/logs/boskos.log" 2>&1 &
+    python3 -u hack/heartbeat_account.py >> "$ARTIFACTS/logs/boskos.log" 2>&1 &
     # shellcheck disable=SC2116
     HEART_BEAT_PID=$(echo $!)
   fi