From 3473ecd7ffc97d45ebed7374e129da16eb4e1357 Mon Sep 17 00:00:00 2001
From: Dusty Phillips <dusty@linux.ca>
Date: Mon, 22 Apr 2013 16:55:09 -0500
Subject: [PATCH] remote-helpers: avoid has_key
It is deprecated.
[fc: do the same in remote-bzr]
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
contrib/remote-helpers/git-remote-bzr | 2 +-
contrib/remote-helpers/git-remote-hg | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr
index aa7bc97beec..cc6609b2f8b 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 548133121d2..2cd19966263 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)