Re: [PATCH] Makefile: Remove usage of deprecated Python "has_key" method

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 28, 2010, 16:38 UTC
Message-ID: <7vy6hc4d0h.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1269737112-21631-1-git-send-email-davvid@gmail.com>

David Aguilar <davvid@gmail.com> writes:

> "has_key" is a deprecated dictionary method in Python 2.6+.
> Simplify the sys.path manipulation for installed scripts by
> passing a default value to os.getenv().

It looks like the old code was replacing sys.path[0] but you are prepending this. Doesn't that change also make a difference?

Show 27 quoted lines

> SCRIPT_PYTHON is currently empty but this future-proofs us.
> It also fixes things for users who maintain local git forks
> with their own SCRIPT_PYTHON additions.
>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
>  Makefile |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 3a6c6ea..806ccdf 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1609,9 +1609,8 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
>  	    -e '}' \
>  	    -e 's|^import sys.*|&; \\\
>  	           import os; \\\
> -	           sys.path[0] = os.environ.has_key("GITPYTHONLIB") and \\\
> -	                         os.environ["GITPYTHONLIB"] or \\\
> -	                         "@@INSTLIBDIR@@"|' \
> +	           sys.path.insert(0, os.getenv("GITPYTHONLIB",\
> +	                                        "@@INSTLIBDIR@@"));|' \
>  	    -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
>  	    $@.py >$@+ && \
>  	chmod +x $@+ && \
> -- 
> 1.7.0.3.291.g5e4f6