From acf63b28928b33d1335dfed1af7e2d8fc6bb5fc4 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@google.com>
Date: Thu, 13 Jun 2019 02:24:21 -0400
Subject: drop pyversion & is_python3 checking
We're committed to Python 3 at this point, so purge all the
is_python3 related dynamic checks.
Bug: https://crbug.com/gerrit/10418
Change-Id: I4c8b405d6de359b8b83223c9f4b9c8ffa18ea1a2
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/292383
Reviewed-by: Chris Mcdonald <cjmcdonald@google.com>
Tested-by: Mike Frysinger <vapier@google.com>
---
subcmds/sync.py | 25 +++++--------------------
1 file changed, 5 insertions(+), 20 deletions(-)
(limited to 'subcmds/sync.py')
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 1e1f2fc1..3482946d 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+import http.cookiejar as cookielib
import json
import netrc
from optparse import SUPPRESS_HELP
@@ -22,26 +23,10 @@ import subprocess
import sys
import tempfile
import time
-
-from pyversion import is_python3
-if is_python3():
- import http.cookiejar as cookielib
- import urllib.error
- import urllib.parse
- import urllib.request
- import xmlrpc.client
-else:
- import cookielib
- import imp
- import urllib2
- import urlparse
- import xmlrpclib
- urllib = imp.new_module('urllib')
- urllib.error = urllib2
- urllib.parse = urlparse
- urllib.request = urllib2
- xmlrpc = imp.new_module('xmlrpc')
- xmlrpc.client = xmlrpclib
+import urllib.error
+import urllib.parse
+import urllib.request
+import xmlrpc.client
try:
import threading as _threading
--
cgit v1.2.3-54-g00ecf