Merge branch 'py3k-backport' into testing

Conflicts:
	sandbox/run_2to3.sh
This commit is contained in:
Valentin Lorentz 2013-01-06 13:41:13 +01:00
commit 755a1c9491
1 changed files with 1 additions and 0 deletions

View File

@ -2,5 +2,6 @@ rm -f src/version.py # Prevent 2to3 from copying it, since py3k/src/version.py w
rm -rf py3k
mkdir py3k
cp -R locales/ py3k/locales
cp -R docs/ py3k/
cp -R plugins/ py3k/plugins # copy plugins data
python 2to3/run.py src/ plugins/ test/ scripts/* setup.py -wWno py3k -f all -f def_iteritems -f def_itervalues -f def_iterkeys -f reload "$@"