summaryrefslogtreecommitdiffstats
path: root/subcmds/upload.py
diff options
context:
space:
mode:
authorChirayu Desai <cdesai@cyanogenmod.org>2013-03-01 19:14:38 +0530
committerChirayu Desai <cdesai@cyanogenmod.org>2013-04-18 21:35:49 +0530
commit217ea7d2747e3098009afe0b389fc4b45f55ea5a (patch)
tree4ea2663a01fb22002ec6cd6ede9cb3babd89a692 /subcmds/upload.py
parentfef4ae74e26efecf5c803793351b6c843eab4970 (diff)
downloadgit-repo-217ea7d2747e3098009afe0b389fc4b45f55ea5a.tar.gz
Some fixes for supporting python3
* Fix imports. * Use python3 syntax. * Wrap map() calls with list(). * Use list() only wherever needed. (Thanks Conley!) * Fix dictionary iteration methods (s/iteritems/items/). * Make use of sorted() in appropriate places * Use iterators directly in the loop. * Don't use .keys() wherever it isn't needed. * Use sys.maxsize instead of sys.maxint TODO: * Make repo work fully with python3. :) Some of this was done by the '2to3' tool [1], by applying the needed fixes in a way that doesn't break compatibility with python2. Links: [1]: http://docs.python.org/2/library/2to3.html Change-Id: Ibdf3bf9a530d716db905733cb9bfef83a48820f7 Signed-off-by: Chirayu Desai <cdesai@cyanogenmod.org>
Diffstat (limited to 'subcmds/upload.py')
-rw-r--r--subcmds/upload.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/subcmds/upload.py b/subcmds/upload.py
index 48ee685c..a34938e5 100644
--- a/subcmds/upload.py
+++ b/subcmds/upload.py
@@ -23,6 +23,11 @@ from editor import Editor
23from error import HookError, UploadError 23from error import HookError, UploadError
24from project import RepoHook 24from project import RepoHook
25 25
26try:
27 input = raw_input
28except NameError:
29 pass
30
26UNUSUAL_COMMIT_THRESHOLD = 5 31UNUSUAL_COMMIT_THRESHOLD = 5
27 32
28def _ConfirmManyUploads(multiple_branches=False): 33def _ConfirmManyUploads(multiple_branches=False):
@@ -33,7 +38,7 @@ def _ConfirmManyUploads(multiple_branches=False):
33 print('ATTENTION: You are uploading an unusually high number of commits.') 38 print('ATTENTION: You are uploading an unusually high number of commits.')
34 print('YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across ' 39 print('YOU PROBABLY DO NOT MEAN TO DO THIS. (Did you rebase across '
35 'branches?)') 40 'branches?)')
36 answer = raw_input("If you are sure you intend to do this, type 'yes': ").strip() 41 answer = input("If you are sure you intend to do this, type 'yes': ").strip()
37 return answer == "yes" 42 return answer == "yes"
38 43
39def _die(fmt, *args): 44def _die(fmt, *args):