mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-08 02:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge trunk up to 45598.

Browse source
This commit is contained in:
Thomas Wouters 2006-04-21 11:28:17 +00:00
parent 49fd7fa443
commit 3fc2ca3884
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/typeobject.c
View file

@ -4183,10 +4183,10 @@ slot_sq_ass_item(PyObject *self, Py_ssize_t index, PyObject *value)
if (value == NULL) if (value == NULL)
res = call_method(self, "__delitem__", &delitem_str, res = call_method(self, "__delitem__", &delitem_str,
"(i)", index); "(n)", index);
else else
res = call_method(self, "__setitem__", &setitem_str, res = call_method(self, "__setitem__", &setitem_str,
"(iO)", index, value); "(nO)", index, value);
if (res == NULL) if (res == NULL)
return -1; return -1;
Py_DECREF(res); Py_DECREF(res);
@ -4201,10 +4201,10 @@ slot_sq_ass_slice(PyObject *self, Py_ssize_t i, Py_ssize_t j, PyObject *value)
if (value == NULL) if (value == NULL)
res = call_method(self, "__delslice__", &delslice_str, res = call_method(self, "__delslice__", &delslice_str,
"(ii)", i, j); "(nn)", i, j);
else else
res = call_method(self, "__setslice__", &setslice_str, res = call_method(self, "__setslice__", &setslice_str,
"(iiO)", i, j, value); "(nnO)", i, j, value);
if (res == NULL) if (res == NULL)
return -1; return -1;
Py_DECREF(res); Py_DECREF(res);

11
Tools/msi/msi.py
View file

@ -908,6 +908,12 @@ def add_files(db):
if files: if files:
# Add an entry to the RemoveFile table to remove bytecode files. # Add an entry to the RemoveFile table to remove bytecode files.
lib.remove_pyc() 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': if dir=='test' and parent.physical=='Lib':
lib.add_file("185test.db") lib.add_file("185test.db")
lib.add_file("audiotest.au") lib.add_file("audiotest.au")
@ -930,9 +936,12 @@ def add_files(db):
if dir=="Icons": if dir=="Icons":
lib.glob("*.gif") lib.glob("*.gif")
lib.add_file("idle.icns") 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-6.exe")
lib.add_file("wininst-7.1.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": if dir=="data" and parent.physical=="test" and parent.basedir.physical=="email":
# This should contain all non-.svn files listed in subversion # This should contain all non-.svn files listed in subversion
for f in os.listdir(lib.absolute): for f in os.listdir(lib.absolute):