diff options
author | Mike Frysinger <vapier@google.com> | 2019-06-13 02:24:21 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@google.com> | 2021-01-06 18:53:58 +0000 |
commit | acf63b28928b33d1335dfed1af7e2d8fc6bb5fc4 (patch) | |
tree | e7b65524857d00cec6b36c989659afd1132d15ce /main.py | |
parent | 784ccfc040dc8efa1a64d3c7d4070b66beb15d08 (diff) | |
download | git-repo-acf63b28928b33d1335dfed1af7e2d8fc6bb5fc4.tar.gz |
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>
Diffstat (limited to 'main.py')
-rwxr-xr-x | main.py | 12 |
1 files changed, 1 insertions, 11 deletions
@@ -28,15 +28,7 @@ import shlex | |||
28 | import sys | 28 | import sys |
29 | import textwrap | 29 | import textwrap |
30 | import time | 30 | import time |
31 | 31 | import urllib.request | |
32 | from pyversion import is_python3 | ||
33 | if is_python3(): | ||
34 | import urllib.request | ||
35 | else: | ||
36 | import imp | ||
37 | import urllib2 | ||
38 | urllib = imp.new_module('urllib') | ||
39 | urllib.request = urllib2 | ||
40 | 32 | ||
41 | try: | 33 | try: |
42 | import kerberos | 34 | import kerberos |
@@ -68,8 +60,6 @@ from wrapper import WrapperPath, Wrapper | |||
68 | 60 | ||
69 | from subcmds import all_commands | 61 | from subcmds import all_commands |
70 | 62 | ||
71 | if not is_python3(): | ||
72 | input = raw_input # noqa: F821 | ||
73 | 63 | ||
74 | # NB: These do not need to be kept in sync with the repo launcher script. | 64 | # NB: These do not need to be kept in sync with the repo launcher script. |
75 | # These may be much newer as it allows the repo launcher to roll between | 65 | # These may be much newer as it allows the repo launcher to roll between |