[clang] [lld] [llvm] Remove `urllib2` and `SocketServer` (PR #120723)

Vinay Deshmukh via llvm-commits llvm-commits at lists.llvm.org
Fri Dec 20 04:08:14 PST 2024


https://github.com/vinay-deshmukh created https://github.com/llvm/llvm-project/pull/120723

Resolves #120299 

1. Testing in CI

>From 5f7a46d117053b582b8ee4c91a46e5edd84fbad2 Mon Sep 17 00:00:00 2001
From: Vinay Deshmukh <32487576+vinay-deshmukh at users.noreply.github.com>
Date: Fri, 20 Dec 2024 16:56:26 +0530
Subject: [PATCH 1/3] Remove `urllib2`

---
 clang/docs/tools/dump_ast_matchers.py | 5 +----
 clang/tools/scan-view/bin/scan-view   | 5 +----
 lld/utils/benchmark.py                | 8 ++------
 llvm/utils/unicode-case-fold.py       | 5 +----
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/clang/docs/tools/dump_ast_matchers.py b/clang/docs/tools/dump_ast_matchers.py
index b6f00657ec914c..4c4a2bd1e9d5a7 100755
--- a/clang/docs/tools/dump_ast_matchers.py
+++ b/clang/docs/tools/dump_ast_matchers.py
@@ -7,10 +7,7 @@
 import re
 import os
 
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
+from urllib.request import urlopen
 
 CLASS_INDEX_PAGE_URL = "https://clang.llvm.org/doxygen/classes.html"
 try:
diff --git a/clang/tools/scan-view/bin/scan-view b/clang/tools/scan-view/bin/scan-view
index d01aebb4029a75..f8dc6c18018de1 100755
--- a/clang/tools/scan-view/bin/scan-view
+++ b/clang/tools/scan-view/bin/scan-view
@@ -10,10 +10,7 @@ import os
 import posixpath
 import threading
 import time
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
+from urllib.request import urlopen
 import webbrowser
 
 # How long to wait for server to start.
diff --git a/lld/utils/benchmark.py b/lld/utils/benchmark.py
index 7202e07ec438d2..4257f6bb160565 100755
--- a/lld/utils/benchmark.py
+++ b/lld/utils/benchmark.py
@@ -14,12 +14,8 @@
 import datetime
 import argparse
 
-try:
-    from urllib.parse import urlencode
-    from urllib.request import urlopen, Request
-except ImportError:
-    from urllib import urlencode
-    from urllib2 import urlopen, Request
+from urllib.parse import urlencode
+from urllib.request import urlopen, Request
 
 
 parser = argparse.ArgumentParser()
diff --git a/llvm/utils/unicode-case-fold.py b/llvm/utils/unicode-case-fold.py
index 9639aa0dc44b41..3ef12a0ef881a8 100755
--- a/llvm/utils/unicode-case-fold.py
+++ b/llvm/utils/unicode-case-fold.py
@@ -22,10 +22,7 @@
 import sys
 import re
 
-try:
-    from urllib.request import urlopen
-except ImportError:
-    from urllib2 import urlopen
+from urllib.request import urlopen
 
 
 # This variable will body of the mappings function

>From d73faddf37c8d880f9f44a02a4df4290aac0f916 Mon Sep 17 00:00:00 2001
From: Vinay Deshmukh <32487576+vinay-deshmukh at users.noreply.github.com>
Date: Fri, 20 Dec 2024 17:00:30 +0530
Subject: [PATCH 2/3] Cleanup import

---
 clang/tools/scan-view/bin/scan-view | 1 -
 1 file changed, 1 deletion(-)

diff --git a/clang/tools/scan-view/bin/scan-view b/clang/tools/scan-view/bin/scan-view
index f8dc6c18018de1..d6b8c446ccfe8a 100755
--- a/clang/tools/scan-view/bin/scan-view
+++ b/clang/tools/scan-view/bin/scan-view
@@ -36,7 +36,6 @@ def url_is_up(url):
 
 
 def start_browser(port, options):
-    import webbrowser
 
     url = 'http://%s:%d' % (options.host, port)
 

>From d377097e7df5a4933112e69cd49d1fe8f8980d05 Mon Sep 17 00:00:00 2001
From: Vinay Deshmukh <32487576+vinay-deshmukh at users.noreply.github.com>
Date: Fri, 20 Dec 2024 17:01:30 +0530
Subject: [PATCH 3/3] Update socketserver to python3

---
 clang/tools/scan-view/bin/scan-view | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/clang/tools/scan-view/bin/scan-view b/clang/tools/scan-view/bin/scan-view
index d6b8c446ccfe8a..b63f494adfbe76 100755
--- a/clang/tools/scan-view/bin/scan-view
+++ b/clang/tools/scan-view/bin/scan-view
@@ -79,10 +79,7 @@ def run(port, options, root):
 
 
 def port_is_open(port):
-    try:
-        import socketserver
-    except ImportError:
-        import SocketServer as socketserver
+    import socketserver
     try:
         t = socketserver.TCPServer((kDefaultHost, port), None)
     except:



More information about the llvm-commits mailing list