Merge

brettcannon · brettcannon · commit 5a5d6a10333a · 2012-04-25T20:18:24.000-04:00
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py
@@ -6,6 +6,13 @@
 work. One should use importlib as the public-facing version of this module.
 
 """
+#
+# IMPORTANT: Whenever making changes to this module, be sure to run
+# a top-level make in order to get the frozen version of the module
+# update. Not doing so, will result in the Makefile to fail for
+# all others who don't have a ./python around to freeze the module
+# in the early stages of compilation.
+#
 
 # See importlib._setup() for what is injected into the global namespace.
 
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
@@ -593,28 +593,28 @@ def remove_loop(fname, tries):
                     pass
                 time.sleep(0.004 * random.randint(0, 4))
 
-        def cleanup(remover, fn, handler):
-            handler.close()
-            remover.join()
-            if os.path.exists(fn):
-                os.unlink(fn)
+        del_count = 500
+        log_count = 500
 
-        fd, fn = tempfile.mkstemp('.log', 'test_logging-3-')
-        os.close(fd)
-        del_count = 1000
-        log_count = 1000
-        remover = threading.Thread(target=remove_loop, args=(fn, del_count))
-        remover.daemon = True
-        remover.start()
         for delay in (False, True):
+            fd, fn = tempfile.mkstemp('.log', 'test_logging-3-')
+            os.close(fd)
+            remover = threading.Thread(target=remove_loop, args=(fn, del_count))
+            remover.daemon = True
+            remover.start()
             h = logging.handlers.WatchedFileHandler(fn, delay=delay)
-            self.addCleanup(cleanup, remover, fn, h)
             f = logging.Formatter('%(asctime)s: %(levelname)s: %(message)s')
             h.setFormatter(f)
-            for _ in range(log_count):
-                time.sleep(0.005)
-                r = logging.makeLogRecord({'msg': 'testing' })
-                h.handle(r)
+            try:
+                for _ in range(log_count):
+                    time.sleep(0.005)
+                    r = logging.makeLogRecord({'msg': 'testing' })
+                    h.handle(r)
+            finally:
+                h.close()
+                remover.join()
+                if os.path.exists(fn):
+                    os.unlink(fn)
 
 
 class BadStream(object):
diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py
@@ -61,7 +61,7 @@ def skip(reason):
     Unconditionally skip a test.
     """
     def decorator(test_item):
-        if not (isinstance(test_item, type) and issubclass(test_item, TestCase)):
+        if not isinstance(test_item, type):
             @functools.wraps(test_item)
             def skip_wrapper(*args, **kwargs):
                 raise SkipTest(reason)
diff --git a/Lib/unittest/test/test_skipping.py b/Lib/unittest/test/test_skipping.py
@@ -66,6 +66,21 @@ def test_1(self):
         self.assertEqual(result.skipped, [(test, "testing")])
         self.assertEqual(record, [])
 
+    def test_skip_non_unittest_class(self):
+        @unittest.skip("testing")
+        class Mixin:
+            def test_1(self):
+                record.append(1)
+        class Foo(Mixin, unittest.TestCase):
+            pass
+        record = []
+        result = unittest.TestResult()
+        test = Foo("test_1")
+        suite = unittest.TestSuite([test])
+        suite.run(result)
+        self.assertEqual(result.skipped, [(test, "testing")])
+        self.assertEqual(record, [])
+
     def test_expected_failure(self):
         class Foo(unittest.TestCase):
             @unittest.expectedFailure
diff --git a/Makefile.pre.in b/Makefile.pre.in
@@ -573,12 +573,23 @@ Modules/Setup: $(srcdir)/Modules/Setup.dist
 
 Modules/_testembed: Modules/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY)
 	$(LINKCC) $(PY_LDFLAGS) $(LINKFORSHARED) -o $@ Modules/_testembed.o $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+
 ############################################################################
 # Importlib
 
 Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py $(srcdir)/Python/freeze_importlib.py
-	./$(BUILDPYTHON) $(srcdir)/Python/freeze_importlib.py \
-	    $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
+	@if test -f ./$(BUILDPYTHON); then \
+	    ./$(BUILDPYTHON) $(srcdir)/Python/freeze_importlib.py \
+		$(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h; \
+	else \
+	    echo "----------------------------------------------------------"; \
+	    echo "Python/importlib.h needs to be rebuilt, but no interpreter"; \
+	    echo "is available to do so. Leaving the previous version in"; \
+	    echo "place. You may want to run ''make'' a second time after"; \
+	    echo "this build is complete."; \
+	    echo "----------------------------------------------------------"; \
+	fi
+
 ############################################################################
 # Special rules for object files
 
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -71,6 +71,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #14664: It is now possible to use @unittest.skip{If,Unless} on a
+  test class that doesn't inherit from TestCase (i.e. a mixin).
+
 - Issue #4892: multiprocessing Connections can now be transferred over
   multiprocessing Connections.  Patch by Richard Oudkerk (sbt).
 
@@ -186,6 +189,9 @@ Tests
 Tools / Demos
 -------------
 
+- Issue #3561: The Windows installer now has an option, off by default, for
+  placing the Python installation into the system "Path" environment variable.
+
 - Issue #13165: stringbench is now available in the Tools/stringbench folder.
   It used to live in its own SVN project.
 
diff --git a/Objects/longobject.c b/Objects/longobject.c
@@ -1657,6 +1657,7 @@ long_to_decimal_string(PyObject *aa)
 
     /* check we've counted correctly */
     assert(p == PyUnicode_1BYTE_DATA(str));
+    assert(_PyUnicode_CheckConsistency(str, 1));
     Py_DECREF(scratch);
     return (PyObject *)str;
 }
@@ -1761,6 +1762,7 @@ _PyLong_Format(PyObject *aa, int base)
     if (negative)
         *--p = '-';
     assert(p == PyUnicode_1BYTE_DATA(v));
+    assert(_PyUnicode_CheckConsistency(v, 1));
     return v;
 }
 
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -375,10 +375,13 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)
     {
         Py_ssize_t i;
         Py_UCS4 maxchar = 0;
-        void *data = PyUnicode_DATA(ascii);
+        void *data;
+        Py_UCS4 ch;
+
+        data = PyUnicode_DATA(ascii);
         for (i=0; i < ascii->length; i++)
         {
-            Py_UCS4 ch = PyUnicode_READ(kind, data, i);
+            ch = PyUnicode_READ(kind, data, i);
             if (ch > maxchar)
                 maxchar = ch;
         }
@@ -398,6 +401,7 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)
             assert(maxchar >= 0x10000);
             assert(maxchar <= MAX_UNICODE);
         }
+        assert(PyUnicode_READ(kind, data, ascii->length) == 0);
     }
     return 1;
 }
diff --git a/Python/importlib.h b/Python/importlib.h
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
diff --git a/Tools/scripts/import_diagnostics.py b/Tools/scripts/import_diagnostics.py

Original file line number	Diff line number	Diff line change
`@@ -1657,6 +1657,7 @@ long_to_decimal_string(PyObject *aa)`
`1657`	`1657`
`1658`	`1658`	`/* check we've counted correctly */`
`1659`	`1659`	`assert(p == PyUnicode_1BYTE_DATA(str));`
	`1660`	`+ assert(_PyUnicode_CheckConsistency(str, 1));`
`1660`	`1661`	`Py_DECREF(scratch);`
`1661`	`1662`	`return (PyObject *)str;`
`1662`	`1663`	`}`
`@@ -1761,6 +1762,7 @@ _PyLong_Format(PyObject *aa, int base)`
`1761`	`1762`	`if (negative)`
`1762`	`1763`	`*--p = '-';`
`1763`	`1764`	`assert(p == PyUnicode_1BYTE_DATA(v));`
	`1765`	`+ assert(_PyUnicode_CheckConsistency(v, 1));`
`1764`	`1766`	`return v;`
`1765`	`1767`	`}`
`1766`	`1768`
Original file line number	Diff line number	Diff line change
`@@ -375,10 +375,13 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)`
`375`	`375`	`{`
`376`	`376`	`Py_ssize_t i;`
`377`	`377`	`Py_UCS4 maxchar = 0;`
`378`		`- void *data = PyUnicode_DATA(ascii);`
	`378`	`+ void *data;`
	`379`	`+ Py_UCS4 ch;`
	`380`	`+`
	`381`	`+ data = PyUnicode_DATA(ascii);`
`379`	`382`	`for (i=0; i < ascii->length; i++)`
`380`	`383`	`{`
`381`		`- Py_UCS4 ch = PyUnicode_READ(kind, data, i);`
	`384`	`+ ch = PyUnicode_READ(kind, data, i);`
`382`	`385`	`if (ch > maxchar)`
`383`	`386`	`maxchar = ch;`
`384`	`387`	`}`
`@@ -398,6 +401,7 @@ _PyUnicode_CheckConsistency(PyObject *op, int check_content)`
`398`	`401`	`assert(maxchar >= 0x10000);`
`399`	`402`	`assert(maxchar <= MAX_UNICODE);`
`400`	`403`	`}`
	`404`	`+ assert(PyUnicode_READ(kind, data, ascii->length) == 0);`
`401`	`405`	`}`
`402`	`406`	`return 1;`
`403`	`407`	`}`