Merge trunk up to 45598.

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 4caf53844991549b0b93081bade8f40fbd08625a..38820d40c0dc6482430cdcdafa445e0b1a7feab0 100644 (file)
--- 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 efa1696a7022ff7197853c1abb0016deb88c56d8..f7d384a6da5674309a39d1d633887e7570d821d3 100644 (file)
--- 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):