Author: thomas.wouters
Date: Fri Apr 21 13:28:17 2006
New Revision: 45599
Modified:
python/branches/p3yk/ (props changed)
python/branches/p3yk/Objects/typeobject.c
python/branches/p3yk/Tools/msi/msi.py
Log:
Merge trunk up to 45598.
Modified: python/branches/p3yk/Objects/typeobject.c
==============================================================================
--- python/branches/p3yk/Objects/typeobject.c (original)
+++ python/branches/p3yk/Objects/typeobject.c Fri Apr 21 13:28:17 2006
@@ -4183,10 +4183,10 @@
if (value == NULL)
res = call_method(self, "__delitem__", &delitem_str,
- "(i)", index);
+ "(n)", index);
else
res = call_method(self, "__setitem__", &setitem_str,
- "(iO)", index, value);
+ "(nO)", index, value);
if (res == NULL)
return -1;
Py_DECREF(res);
@@ -4201,10 +4201,10 @@
if (value == NULL)
res = call_method(self, "__delslice__", &delslice_str,
- "(ii)", i, j);
+ "(nn)", i, j);
else
res = call_method(self, "__setslice__", &setslice_str,
- "(iiO)", i, j, value);
+ "(nnO)", i, j, value);
if (res == NULL)
return -1;
Py_DECREF(res);
Modified: python/branches/p3yk/Tools/msi/msi.py
==============================================================================
--- python/branches/p3yk/Tools/msi/msi.py (original)
+++ python/branches/p3yk/Tools/msi/msi.py Fri Apr 21 13:28:17 2006
@@ -908,6 +908,12 @@
if files:
# Add an entry to the RemoveFile table to remove bytecode files.
lib.remove_pyc()
+ if dir.endswith('.egg-info'):
+ lib.add_file('entry_points.txt')
+ lib.add_file('PKG-INFO')
+ lib.add_file('top_level.txt')
+ lib.add_file('zip-safe')
+ continue
if dir=='test' and parent.physical=='Lib':
lib.add_file("185test.db")
lib.add_file("audiotest.au")
@@ -930,9 +936,12 @@
if dir=="Icons":
lib.glob("*.gif")
lib.add_file("idle.icns")
- if dir=="command":
+ if dir=="command" and parent.physical=="distutils":
lib.add_file("wininst-6.exe")
lib.add_file("wininst-7.1.exe")
+ if dir=="setuptools":
+ lib.add_file("cli.exe")
+ lib.add_file("gui.exe")
if dir=="data" and parent.physical=="test" and
parent.basedir.physical=="email":
# This should contain all non-.svn files listed in subversion
for f in os.listdir(lib.absolute):
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
