From: Dusty Phillips Date: Mon, 22 Apr 2013 21:55:09 +0000 (-0500) Subject: remote-helpers: avoid has_key X-Git-Tag: v1.8.3-rc0~14^2~15 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3473ecd7ffc97d45ebed7374e129da16eb4e1357 remote-helpers: avoid has_key It is deprecated. [fc: do the same in remote-bzr] Signed-off-by: Felipe Contreras Signed-off-by: Junio C Hamano --- diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index aa7bc97bee..cc6609b2f8 100755 --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -94,7 +94,7 @@ class Marks: return self.last_mark def is_marked(self, rev): - return self.marks.has_key(rev) + return str(rev) in self.marks def new_mark(self, rev, mark): self.marks[rev] = mark diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 548133121d..2cd1996626 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -129,7 +129,7 @@ class Marks: self.last_mark = mark def is_marked(self, rev): - return self.marks.has_key(str(rev)) + return str(rev) in self.marks def get_tip(self, branch): return self.tips.get(branch, 0)