diff options
| author | Thomas Wouters <thomas@python.org> | 2006-04-21 11:28:17 (GMT) |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2006-04-21 11:28:17 (GMT) |
| commit | 3fc2ca3884bec42d9b68336183bb07a83311ea56 (patch) | |
| tree | c6beef5b10f82cf2d8fc3ed8ec626fd36b70afc4 | |
| parent | 49fd7fa4431da299196d74087df4a04f99f9c46f (diff) | |
| download | cpython-3fc2ca3884bec42d9b68336183bb07a83311ea56.zip cpython-3fc2ca3884bec42d9b68336183bb07a83311ea56.tar.gz cpython-3fc2ca3884bec42d9b68336183bb07a83311ea56.tar.bz2 | |
Merge trunk up to 45598.
| -rw-r--r-- | Objects/typeobject.c | 8 | ||||
| -rw-r--r-- | Tools/msi/msi.py | 11 |
2 files changed, 14 insertions, 5 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 4caf538..38820d4 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -4183,10 +4183,10 @@ slot_sq_ass_item(PyObject *self, Py_ssize_t index, PyObject *value) 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 @@ slot_sq_ass_slice(PyObject *self, Py_ssize_t i, Py_ssize_t j, PyObject *value) 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); diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index efa1696..f7d384a 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -908,6 +908,12 @@ def add_files(db): 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 @@ def add_files(db): 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): |