From acf63b28928b33d1335dfed1af7e2d8fc6bb5fc4 Mon Sep 17 00:00:00 2001 From: Mike Frysinger 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 Tested-by: Mike Frysinger --- main.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'main.py') diff --git a/main.py b/main.py index cd0b8620..f638a677 100755 --- a/main.py +++ b/main.py @@ -28,15 +28,7 @@ import shlex import sys import textwrap import time - -from pyversion import is_python3 -if is_python3(): - import urllib.request -else: - import imp - import urllib2 - urllib = imp.new_module('urllib') - urllib.request = urllib2 +import urllib.request try: import kerberos @@ -68,8 +60,6 @@ from wrapper import WrapperPath, Wrapper from subcmds import all_commands -if not is_python3(): - input = raw_input # noqa: F821 # NB: These do not need to be kept in sync with the repo launcher script. # These may be much newer as it allows the repo launcher to roll between -- cgit v1.2.3-54-g00ecf