aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo/util.py
diff options
context:
space:
mode:
authorbors-servo <infra@servo.org>2023-04-10 21:03:33 +0200
committerGitHub <noreply@github.com>2023-04-10 21:03:33 +0200
commitd579bd91b8e82606907dd789f13f6ecaee6a9b18 (patch)
tree3dc7a8736130191a0487f3558ba9fd98f9904b5e /python/servo/util.py
parentf28f68eb251be132f237318a05d4e8bc98db69ce (diff)
parente9942bddb0dd3ae67403e3ca486bea2e0f4ce954 (diff)
downloadservo-d579bd91b8e82606907dd789f13f6ecaee6a9b18.tar.gz
servo-d579bd91b8e82606907dd789f13f6ecaee6a9b18.zip
Auto merge of #29608 - mrobinson:six.moves.urllib, r=mukilan
Replace usage of six.moves.urllib with urllib Also organize some of the imports. Now that Servo only uses Python 3, this module is unnecessary. This is part of the gradual migration to using only Python 3. <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because they do not change behavior. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'python/servo/util.py')
-rw-r--r--python/servo/util.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/python/servo/util.py b/python/servo/util.py
index 84dd19e5208..c41cb1e1640 100644
--- a/python/servo/util.py
+++ b/python/servo/util.py
@@ -14,14 +14,14 @@ import os
import os.path
import platform
import shutil
-from socket import error as socket_error
import stat
-from io import BytesIO
import sys
import time
+import urllib
import zipfile
-import six.moves.urllib as urllib
+from io import BytesIO
+from socket import error as socket_error
try:
from ssl import HAS_SNI