summaryrefslogtreecommitdiffstats
path: root/main.py
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2013-04-19 15:31:28 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-04-19 15:31:29 +0000
commitc4c01f914c7cdfa997be60ea97cd487d63333a04 (patch)
treec7063f88ab55998187c907807364ce7f4444cc4a /main.py
parent51813dfed1528307c46707bc38b4db33b87bb36e (diff)
parent217ea7d2747e3098009afe0b389fc4b45f55ea5a (diff)
downloadgit-repo-c4c01f914c7cdfa997be60ea97cd487d63333a04.tar.gz
Merge "Some fixes for supporting python3"
Diffstat (limited to 'main.py')
-rwxr-xr-xmain.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/main.py b/main.py
index 9cc2639a..49d24823 100755
--- a/main.py
+++ b/main.py
@@ -50,6 +50,11 @@ from pager import RunPager
50 50
51from subcmds import all_commands 51from subcmds import all_commands
52 52
53try:
54 input = raw_input
55except NameError:
56 pass
57
53global_options = optparse.OptionParser( 58global_options = optparse.OptionParser(
54 usage="repo [-p|--paginate|--no-pager] COMMAND [ARGS]" 59 usage="repo [-p|--paginate|--no-pager] COMMAND [ARGS]"
55 ) 60 )
@@ -286,7 +291,7 @@ def _AddPasswordFromUserInput(handler, msg, req):
286 if user is None: 291 if user is None:
287 print(msg) 292 print(msg)
288 try: 293 try:
289 user = raw_input('User: ') 294 user = input('User: ')
290 password = getpass.getpass() 295 password = getpass.getpass()
291 except KeyboardInterrupt: 296 except KeyboardInterrupt:
292 return 297 return