This is an automated email from the ASF dual-hosted git repository. lfrolov pushed a commit to branch DATALAB-2091 in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit f85698507d56048640b23b5a5a7fa0881b42d17a Author: leonidfrolov <[email protected]> AuthorDate: Tue May 25 16:57:12 2021 +0300 [DATALAB-2091]: fixed some urllib usage errors --- .../src/general/lib/aws/actions_lib.py | 13 +++++++------ .../src/general/lib/azure/actions_lib.py | 7 ++++--- .../src/general/lib/gcp/actions_lib.py | 13 +++++++------ 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py index e34de9d..87a95ea 100644 --- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py +++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py @@ -30,6 +30,7 @@ import sys import time import traceback import urllib3 +import urllib.request import uuid import subprocess import datalab.fab @@ -1279,8 +1280,8 @@ def remove_kernels(emr_name, tag_name, nb_tag_value, ssh_user, key_path, emr_ver '/opt/zeppelin/conf/zeppelin-env.sh') con.sudo("rm -rf /home/{}/.ensure_dir/dataengine-service_interpreter_ensure".format(ssh_user)) zeppelin_url = 'http://' + private + ':8080/api/interpreter/setting/' - opener = urllib3.build_opener(urllib3.ProxyHandler({})) - req = opener.open(urllib3.Request(zeppelin_url)) + opener = urllib.request.build_opener(urllib.request.ProxyHandler({})) + req = opener.open(urllib.request.Request(zeppelin_url)) r_text = req.read() interpreter_json = json.loads(r_text) interpreter_prefix = emr_name @@ -1288,7 +1289,7 @@ def remove_kernels(emr_name, tag_name, nb_tag_value, ssh_user, key_path, emr_ver if interpreter_prefix in interpreter['name']: print("Interpreter with ID: {0} and name: {1} will be removed from zeppelin!". format(interpreter['id'], interpreter['name'])) - request = urllib3.Request(zeppelin_url + interpreter['id'], data='') + request = urllib.request.Request(zeppelin_url + interpreter['id'], data=''.encode()) request.get_method = lambda: 'DELETE' url = opener.open(request) print(url.read()) @@ -1893,8 +1894,8 @@ def remove_dataengine_kernels(tag_name, notebook_name, os_user, key_path, cluste 'sed -i \"s/^export SPARK_HOME.*/export SPARK_HOME=\/opt\/spark/\" /opt/zeppelin/conf/zeppelin-env.sh') con.sudo("rm -rf /home/{}/.ensure_dir/dataengine_interpreter_ensure".format(os_user)) zeppelin_url = 'http://' + private + ':8080/api/interpreter/setting/' - opener = urllib3.build_opener(urllib3.ProxyHandler({})) - req = opener.open(urllib3.Request(zeppelin_url)) + opener = urllib.request.build_opener(urllib.request.ProxyHandler({})) + req = opener.open(urllib.request.Request(zeppelin_url)) r_text = req.read() interpreter_json = json.loads(r_text) interpreter_prefix = cluster_name @@ -1902,7 +1903,7 @@ def remove_dataengine_kernels(tag_name, notebook_name, os_user, key_path, cluste if interpreter_prefix in interpreter['name']: print("Interpreter with ID: {} and name: {} will be removed from zeppelin!".format( interpreter['id'], interpreter['name'])) - request = urllib3.Request(zeppelin_url + interpreter['id'], data='') + request = urllib.request.Request(zeppelin_url + interpreter['id'], data=''.encode()) request.get_method = lambda: 'DELETE' url = opener.open(request) print(url.read()) diff --git a/infrastructure-provisioning/src/general/lib/azure/actions_lib.py b/infrastructure-provisioning/src/general/lib/azure/actions_lib.py index df48b93..27e5488 100644 --- a/infrastructure-provisioning/src/general/lib/azure/actions_lib.py +++ b/infrastructure-provisioning/src/general/lib/azure/actions_lib.py @@ -32,6 +32,7 @@ import sys import time import traceback import urllib3 +import urllib.request import subprocess from azure.common.client_factory import get_client_from_auth_file from azure.datalake.store import core, lib @@ -989,8 +990,8 @@ class AzureActions: 'sed -i \"s/^export SPARK_HOME.*/export SPARK_HOME=\/opt\/spark/\" /opt/zeppelin/conf/zeppelin-env.sh') conn.sudo("rm -rf /home/{}/.ensure_dir/dataengine_interpreter_ensure".format(os_user)) zeppelin_url = 'http://' + private + ':8080/api/interpreter/setting/' - opener = urllib3.build_opener(urllib3.ProxyHandler({})) - req = opener.open(urllib3.Request(zeppelin_url)) + opener = urllib.request.build_opener(urllib.request.ProxyHandler({})) + req = opener.open(urllib.request.Request(zeppelin_url)) r_text = req.read() interpreter_json = json.loads(r_text) interpreter_prefix = cluster_name @@ -998,7 +999,7 @@ class AzureActions: if interpreter_prefix in interpreter['name']: print("Interpreter with ID: {0} and name: {1} will be removed from zeppelin!". format(interpreter['id'], interpreter['name'])) - request = urllib3.Request(zeppelin_url + interpreter['id'], data='') + request = urllib.request.Request(zeppelin_url + interpreter['id'], data=''.encode()) request.get_method = lambda: 'DELETE' url = opener.open(request) print(url.read()) diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py index c8b0b19..4589980 100644 --- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py +++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py @@ -33,6 +33,7 @@ import sys import time import traceback import urllib3 +import urllib.request import subprocess from Crypto.PublicKey import RSA from datalab.fab import * @@ -1159,8 +1160,8 @@ class GCPActions: con.sudo('sed -i \"s/^export SPARK_HOME.*/export SPARK_HOME=\/opt\/spark/\" /opt/zeppelin/conf/zeppelin-env.sh') con.sudo("rm -rf /home/{}/.ensure_dir/dataengine-service_interpreter_ensure".format(ssh_user)) zeppelin_url = 'http://' + notebook_ip + ':8080/api/interpreter/setting/' - opener = urllib3.build_opener(urllib3.ProxyHandler({})) - req = opener.open(urllib3.Request(zeppelin_url)) + opener = urllib.request.build_opener(urllib.request.ProxyHandler({})) + req = opener.open(urllib.request.Request(zeppelin_url)) r_text = req.read() interpreter_json = json.loads(r_text) interpreter_prefix = dataproc_name @@ -1168,7 +1169,7 @@ class GCPActions: if interpreter_prefix in interpreter['name']: print("Interpreter with ID: {} and name: {} will be removed from zeppelin!".format( interpreter['id'], interpreter['name'])) - request = urllib3.Request(zeppelin_url + interpreter['id'], data='') + request = urllib.request.Request(zeppelin_url + interpreter['id'], data=''.encode()) request.get_method = lambda: 'DELETE' url = opener.open(request) print(url.read()) @@ -1464,8 +1465,8 @@ def remove_dataengine_kernels(notebook_name, os_user, key_path, cluster_name): 'sed -i \"s/^export SPARK_HOME.*/export SPARK_HOME=\/opt\/spark/\" /opt/zeppelin/conf/zeppelin-env.sh') con.sudo("rm -rf /home/{}/.ensure_dir/dataengine_interpreter_ensure".format(os_user)) zeppelin_url = 'http://' + private + ':8080/api/interpreter/setting/' - opener = urllib3.build_opener(urllib3.ProxyHandler({})) - req = opener.open(urllib3.Request(zeppelin_url)) + opener = urllib.request.build_opener(urllib.request.ProxyHandler({})) + req = opener.open(urllib.request.Request(zeppelin_url)) r_text = req.read() interpreter_json = json.loads(r_text) interpreter_prefix = cluster_name @@ -1473,7 +1474,7 @@ def remove_dataengine_kernels(notebook_name, os_user, key_path, cluster_name): if interpreter_prefix in interpreter['name']: print("Interpreter with ID: {} and name: {} will be removed from zeppelin!".format( interpreter['id'], interpreter['name'])) - request = urllib3.Request(zeppelin_url + interpreter['id'], data='') + request = urllib.request.Request(zeppelin_url + interpreter['id'], data=''.encode()) request.get_method = lambda: 'DELETE' url = opener.open(request) print(url.read()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
