Derived from SF patch #446899 Permit import of .pyw under Windows, from

David Bolen.

Lib/test/test_import.py

@@ -16,9 +16,8 @@ else:
 # Another brief digression to test the accuracy of manifest float constants.
 import double_const  # don't blink -- that *was* the test
 
-sys.path.insert(0, os.curdir)
-
-source = TESTFN + ".py"
+def test_with_extension(ext): # ext normally ".py"; perhaps ".pyw"
+    source = TESTFN + ext
     pyo = TESTFN + ".pyo"
     if sys.platform.startswith('java'):
         pyc = TESTFN + "$py.class"
@@ -26,7 +25,7 @@ else:
         pyc = TESTFN + ".pyc"
 
     f = open(source, "w")
-print >> f, "# This will test Python's ability to import a .py file"
+    print >> f, "# This tests Python's ability to import a", ext, "file."
     a = random.randrange(1000)
     b = random.randrange(1000)
     print >> f, "a =", a
@@ -37,12 +36,12 @@ try:
         try:
             mod = __import__(TESTFN)
         except ImportError, err:
-        raise ValueError, "import from .py failed: %s" % err
+            raise ValueError("import from %s failed: %s" % (ext, err))
 
         if mod.a != a or mod.b != b:
             print a, "!=", mod.a
             print b, "!=", mod.b
-        raise ValueError, "module loaded (%s) but contents invalid" % mod
+            raise ValueError("module loaded (%s) but contents invalid" % mod)
     finally:
         os.unlink(source)
 
@@ -50,7 +49,7 @@ try:
         try:
             reload(mod)
         except ImportError, err:
-        raise ValueError, "import from .pyc/.pyo failed: %s" % err
+            raise ValueError("import from .pyc/.pyo failed: %s" % err)
     finally:
         try:
             os.unlink(pyc)
@@ -60,5 +59,13 @@ finally:
             os.unlink(pyo)
         except os.error:
             pass
+        del sys.modules[TESTFN]
 
+sys.path.insert(0, os.curdir)
+try:
+    test_with_extension(".py")
+    if sys.platform.startswith("win"):
+        for ext in ".PY", ".Py", ".pY", ".pyw", ".PYW", ".pYw":
+            test_with_extension(ext)
+finally:
     del sys.path[0]

Misc/ACKS

@@ -42,6 +42,7 @@ Roy Bixler
 Pablo Bleyer
 Finn Bock
 Paul Boddie
+David Bolen
 Jurjen Bos
 Peter Bosch
 Eric Bouck

Misc/NEWS

@@ -38,6 +38,11 @@ C API
   sure to check the Unicode width compatibility in their extensions by
   using at least one of the mangled Unicode APIs in the extension.
 
+Windows
+
+- "import module" now compiles module.pyw if it exists and nothing else
+  relevant is found.
+
 
 What's New in Python 2.2a1?
 ===========================

Python/import.c

@@ -70,6 +70,9 @@ static const struct filedescr _PyImport_StandardFiletab[] = {
 #else
 static const struct filedescr _PyImport_StandardFiletab[] = {
 	{".py", "r", PY_SOURCE},
+#ifdef MS_WIN32
+	{".pyw", "r", PY_SOURCE},
+#endif	
 	{".pyc", "rb", PY_COMPILED},
 	{0, 0}
 };
@@ -513,13 +516,19 @@ PyImport_ExecCodeModuleEx(char *name, PyObject *co, char *pathname)
 static char *
 make_compiled_pathname(char *pathname, char *buf, size_t buflen)
 {
-	size_t len;
-
-	len = strlen(pathname);
+	size_t len = strlen(pathname);
 	if (len+2 > buflen)
 		return NULL;
-	strcpy(buf, pathname);
-	strcpy(buf+len, Py_OptimizeFlag ? "o" : "c");
+
+#ifdef MS_WIN32
+	/* Treat .pyw as if it were .py.  The case of ".pyw" must match
+	   that used in _PyImport_StandardFiletab. */
+	if (len >= 4 && strcmp(&pathname[len-4], ".pyw") == 0)
+		--len;	/* pretend 'w' isn't there */
+#endif
+	memcpy(buf, pathname, len);
+	buf[len] = Py_OptimizeFlag ? 'o' : 'c';
+	buf[len+1] = '\0';
 
 	return buf;
 }