[Python-Dev] [Python-checkins] cpython (3.1): Do not add txt files twice.

[Victor Stinner]

I added the "if dir=='cjkencodings':" to msi.py, based on tests for other 
subdirectories in Lib/tests/. Can you explain me why cjkencodings should not 
have a special case? The fix should maybe be ported to 3.2, 3.3 and 2.7.

Victor

Le dimanche 05 juin 2011 11:00:30, martin.v.loewis a écrit :
> http://hg.python.org/cpython/rev/df7b9c5d6ba1
> changeset:   70643:df7b9c5d6ba1
> branch:      3.1
> parent:      70571:0639e630426c
> user:        Martin v. Löwis <martin at v.loewis.de>
> date:        Sun Jun 05 10:55:57 2011 +0200
> summary:
>   Do not add txt files twice.
> 
> files:
>   Tools/msi/msi.py |  2 --
>   1 files changed, 0 insertions(+), 2 deletions(-)
> 
> 
> diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
> --- a/Tools/msi/msi.py
> +++ b/Tools/msi/msi.py
> @@ -1021,8 +1021,6 @@
>              lib.add_file("zipdir.zip")
>          if dir=='tests' and parent.physical=='distutils':
>              lib.add_file("Setup.sample")
> -        if dir=='cjkencodings':
> -            lib.glob("*.txt")
>          if dir=='decimaltestdata':
>              lib.glob("*.decTest")
>          if dir=='output':