bpo-29770: remove outdated PYO related info (GH-590) (GH-613)

2 files changed, 11 insertions, 17 deletions

diff --git a/PCbuild/rmpyc.py b/PCbuild/rmpyc.py
index a1e75bb..0b58f68 100644
--- a/PCbuild/rmpyc.py
+++ b/PCbuild/rmpyc.py
@@ -1,25 +1,19 @@
-# Remove all the .pyc and .pyo files under ../Lib.
+# Remove all the .pyc files under ../Lib.
 
 
 def deltree(root):
     import os
     from os.path import join
 
-    npyc = npyo = 0
+    npyc = 0
     for root, dirs, files in os.walk(root):
         for name in files:
-            delete = False
-            if name.endswith('.pyc'):
-                delete = True
+            # to be thorough
+            if name.endswith(('.pyc', '.pyo')):
                 npyc += 1
-            elif name.endswith('.pyo'):
-                delete = True
-                npyo += 1
-
-            if delete:
                 os.remove(join(root, name))
 
-    return npyc, npyo
+    return npyc
 
-npyc, npyo = deltree("../Lib")
-print(npyc, ".pyc deleted,", npyo, ".pyo deleted")
+npyc = deltree("../Lib")
+print(npyc, ".pyc deleted")
diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
index 2d93b80..2056854 100644
--- a/PCbuild/rt.bat
+++ b/PCbuild/rt.bat
@@ -4,8 +4,8 @@ rem Usage:  rt [-d] [-O] [-q] [-x64] regrtest_args
 rem -d   Run Debug build (python_d.exe).  Else release build.

 rem -O   Run python.exe or python_d.exe (see -d) with -O.

 rem -q   "quick" -- normally the tests are run twice, the first time

-rem      after deleting all the .py[co] files reachable from Lib/.

-rem      -q runs the tests just once, and without deleting .py[co] files.

+rem      after deleting all the .pyc files reachable from Lib/.

+rem      -q runs the tests just once, and without deleting .pyc files.

 rem -x64 Run the 64-bit build of python (or python_d if -d was specified)

 rem      from the 'amd64' dir instead of the 32-bit build in this dir.

 rem All leading instances of these switches are shifted off, and

@@ -45,14 +45,14 @@ set exe=%prefix%python%suffix%.exe
 set cmd="%exe%" %dashO% -Wd -E -bb "%pcbuild%..\lib\test\regrtest.py" %regrtestargs%

 if defined qmode goto Qmode

 

-echo Deleting .pyc/.pyo files ...

+echo Deleting .pyc files ...

 "%exe%" "%pcbuild%rmpyc.py"

 

 echo on

 %cmd%

 @echo off

 

-echo About to run again without deleting .pyc/.pyo first:

+echo About to run again without deleting .pyc first:

 pause

 

 :Qmode