Fix ez_setup problem for python2.6 on Unbutu.

[Jisi Liu, 2011-01-19 07:47:16]

The problem is for python2.6 in ubuntu. pkg_resources.py is already installed,
but without setuptools module.

In this case, the use_setuptools() script will download and install the egg, but
didn't remove the pkg_resources module.

This patch should be able to fix the issue.

[kenton, 2011-01-19 19:55:46]

Is this the only thing that has changed in newer versions of ez_setup.py?  I
think you should grab the latest version from setuptools.

On Tue, Jan 18, 2011 at 11:47 PM, <liujisi@google.com> wrote:

> Reviewers: kenton,
>
> Message:
> The problem is for python2.6 in ubuntu. pkg_resources.py is already
> installed, but without setuptools module.
>
> In this case, the use_setuptools() script will download and install the
> egg, but didn't remove the pkg_resources module.
>
> This patch should be able to fix the issue.
>
>
>
> Please review this at http://codereview.appspot.com/3985042/
>
> Affected files:
>  M python/ez_setup.py
>
>
> Index: python/ez_setup.py
> diff --git a/python/ez_setup.py b/python/ez_setup.py
> index
>
b7a9849eaeb5d8f88bf93c704553d30f8047d404..cef355719015cb17dbd841a3c6496f7e8cadd5b1
> 100755
> --- a/python/ez_setup.py
> +++ b/python/ez_setup.py
> @@ -113,6 +113,7 @@ def use_setuptools(
>             del pkg_resources, sys.modules['pkg_resources']    # reload ok
>             return do_download()
>     except pkg_resources.DistributionNotFound:
> +        del pkg_resources, sys.modules['pkg_resources']    # reload ok
>         return do_download()
>
>  def download_setuptools(
> @@ -273,9 +274,3 @@ if __name__=='__main__':
>         update_md5(sys.argv[2:])
>     else:
>         main(sys.argv[1:])
> -
> -
> -
> -
> -
> -
>
>
>

[Jisi Liu, 2011-01-20 06:27:03]

Updated the script to c11. P.J, could you please take a look to check if this
fix is appropriate?

Thanks.

[pje_telecommunity.com, 2011-01-20 19:00:10]

At 06:27 AM 1/20/2011 +0000, liujisi@google.com wrote:
>Updated the script to c11. P.J, could you please take a look to check if
>this fix is appropriate?
>
>Thanks.
>
>http://codereview.appspot.com/3985042/

Looks good to me.  I've implemented it slightly differently myself 
(fusing the two paths into a common exit), but your version should 
work just as well.

[kenton, 2011-01-20 21:08:01]

Let's copy the official version to avoid confusion.

Thanks, PJ.

On Thu, Jan 20, 2011 at 10:59 AM, P.J. Eby <pje@telecommunity.com> wrote:

> At 06:27 AM 1/20/2011 +0000, liujisi@google.com wrote:
>
>> Updated the script to c11. P.J, could you please take a look to check if
>> this fix is appropriate?
>>
>> Thanks.
>>
>> http://codereview.appspot.com/3985042/
>>
>
> Looks good to me.  I've implemented it slightly differently myself (fusing
> the two paths into a common exit), but your version should work just as
> well.
>
>

[Jisi Liu, 2011-01-21 05:35:51]

Sure. Synced to the latest version, and submitting.

Thanks P.J.