[PATCH 2 of 2] py3: use iter() instead of iterkeys()

Yuya Nishihara yuya at tcha.org
Wed Mar 15 09:06:22 EDT 2017


On Wed, 15 Mar 2017 15:05:11 +0530, Rishabh Madan wrote:
> # HG changeset patch
> # User Rishabh Madan <rishabhmadan96 at gmail.com>
> # Date 1489569941 -19800
> #      Wed Mar 15 14:55:41 2017 +0530
> # Node ID c289886e8c1fd3df6b72f7019e930494ecc4c3b0
> # Parent  1ada79790380d3f9e416780f6447b383cc18f817
> py3: use iter() instead of iterkeys()
> 
> The iterkeys() method has been deprecated for python3. This patch uses iter()
> over dict.keys() to get the iterator object.
> 
> diff -r 1ada79790380 -r c289886e8c1f mercurial/util.py
> --- a/mercurial/util.py	Wed Mar 15 14:51:18 2017 +0530
> +++ b/mercurial/util.py	Wed Mar 15 14:55:41 2017 +0530
> @@ -2918,7 +2918,10 @@
>              del dirs[base]
>  
>      def __iter__(self):
> -        return self._dirs.iterkeys()
> +        if pycompat.ispy3:
> +            return iter(self._dirs.keys())
> +        else:
> +            return self._dirs.iterkeys()

Can't we simply do return iter(self._dirs) ?


More information about the Mercurial-devel mailing list