Convert switcher4.py to python 3 am: 9ae90f6ff9 am: cb0539b94d am: af28506348 am: 762c910ca1HEADt_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-u-beta-1-gplandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r55android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_odp_341610000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_cfg_341510000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000mastermain-16k-with-phonesmain-16kmainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-uwb-releaseandroid14-mainline-healthfitness-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz5_341510010aml_tz4_332714010

Original change: https://android-review.googlesource.com/c/platform/tools/doc_generation/+/1935069

Change-Id: I7311d834ef1d4da65222c0dcd2a219c7f2eb9061

2 files changed, 36 insertions, 45 deletions

diff --git a/Android.bp b/Android.bp
index 4f473a0..f1178af 100644
--- a/Android.bp
+++ b/Android.bp
@@ -19,13 +19,4 @@ package {
 python_binary_host {
     name: "switcher4",
     srcs: ["switcher4.py",],
-
-    version: {
-        py2: {
-            enabled: true,
-        },
-        py3: {
-            enabled: false,
-        },
-    },
 }
diff --git a/switcher4.py b/switcher4.py
index 6cd7739..58f1ba3 100644
--- a/switcher4.py
+++ b/switcher4.py
@@ -43,7 +43,7 @@ java_ref_root = os.getcwd()
 kotlin_ref_root = os.path.join(java_ref_root, "kotlin")
 root = os.path.split(java_ref_root)[1]
 if root != "reference":
-  print ("You must cd to the refocs reference/ root directoy")
+  print("You must cd to the refocs reference/ root directory")
   sys.exit()
 
 
@@ -82,10 +82,10 @@ def insert_stub(doc, java, both):
   stubs = stubs+1
 
   if verbose:
-    print "File: ", stubs, doc
+    print("File: ", stubs, doc)
   else:
     fn  = os.path.split(doc)
-    print "File: ", stubs, fn[1], "\r",
+    print("File: ", stubs, fn[1], end="\r")
 
   if (java):
       java_stubs = java_stubs + 1
@@ -137,7 +137,7 @@ def scan_files(stem):
   solo = 0
   both = 0
 
-  print "*** PASS1 (Java) ***"
+  print("*** PASS1 (Java) ***")
   maxed_out = False
   for root, dirs, files in os.walk(java_source_abs_path):
       if maxed_out:
@@ -147,7 +147,7 @@ def scan_files(stem):
         ext = ext[1]
         if not ext:
           # this catches package-lists with no extension
-          print "***", os.path.join(root, file_)
+          print("***", os.path.join(root, file_))
         elif ext != ".html":
           # filter out png, yaml, etc
           continue
@@ -167,23 +167,23 @@ def scan_files(stem):
           else:
             # no kotlin content
             if (show_solo):
-              print "solo: ", doc
+              print("solo: ", doc)
             insert_stub(doc, True, False)
             solo = solo+1
 
           if max_stubs>0 and stubs>=max_stubs:
-            print
-            print "max java stubs: ", max_stubs
+            print()
+            print("max java stubs: ", max_stubs)
             maxed_out = True;
             break
 
-  print "Java+Kotlin:", both, "Only Java:", solo
-  print
+  print("Java+Kotlin:", both, "Only Java:", solo)
+  print()
 
 
   # PASS 2
   # Loop over kotlin content, create stubs for Kotlin-only APIs
-  print "*** PASS2 (Kotlin) ***"
+  print("*** PASS2 (Kotlin) ***")
   solo = 0
   both = 0
   maxed_out = False
@@ -196,7 +196,7 @@ def scan_files(stem):
         ext = ext[1]
         if not ext:
           # this catches package-lists with no extension
-          print "***", os.path.join(root, file_)
+          print("***", os.path.join(root, file_))
         elif ext != ".html":
           # filter out png, yaml, etc
           continue
@@ -217,20 +217,20 @@ def scan_files(stem):
             # no java content
             # create the kotlin stub file
             if (show_solo):
-              print "solo: ", doc
+              print("solo: ", doc)
             insert_stub(doc , False, False)
             solo = solo+1
 
           if (max_stubs>0 and stubs>=max_stubs):
-            print
-            print "max koltin stubs: ", max_stubs
+            print()
+            print("max koltin stubs: ", max_stubs)
             maxed_out = True;
             break
 
 
-  print "Java+Kotlin:", both, "Only Kotlin:", solo
-  print
-  print "Java: ", java_stubs, " Kotlin: ", kotlin_stubs, "Total: ", java_stubs + kotlin_stubs
+  print("Java+Kotlin:", both, "Only Kotlin:", solo)
+  print()
+  print("Java: ", java_stubs, " Kotlin: ", kotlin_stubs, "Total: ", java_stubs + kotlin_stubs)
 
 
 def main(argv):
@@ -243,56 +243,56 @@ def main(argv):
   try:
     opts, args = getopt.getopt(argv,"",["work","verbose","solo","max="])
   except getopt.GetoptError:
-    print 'USAGE: switcher --work --verbose --solo --max=<max_stubs> platform|androidx|support|chrome'
+    print('USAGE: switcher --work --verbose --solo --max=<max_stubs> platform|androidx|support|chrome')
     sys.exit(2)
 
   for opt, arg in opts:
     if opt == '--work':
        work = True
     elif opt == "--verbose":
-       print "verbose"
+       print("verbose")
        verbose = True
     elif opt == "--solo":
-       print "verbose"
+       print("verbose")
        show_solo = True
     elif opt == "--max":
        max_stubs = int(arg)
-       print "max ", max_stubs
+       print("max ", max_stubs)
 
   if len(args)>0:
     source = args[0]
     if source == "platform":
       stem = "android"
-      print
-      print "*** PLATFORM PAGES ***"
-      print "======================"
+      print()
+      print("*** PLATFORM PAGES ***")
+      print("======================")
 
       # Insert the switchers at the top level first
       insert_platform_summaries()
 
     elif source == "androidx":
       stem = "androidx"
-      print
-      print "*** ANDROIDX SUPPORT LIBRARY PAGES ***"
-      print "======================================"
+      print()
+      print("*** ANDROIDX SUPPORT LIBRARY PAGES ***")
+      print("======================================")
 
     elif source == "support":
       stem = "android/support/v4/media"
-      print
-      print "*** ANDROIDX SUPPORT LIBRARY PAGES ***"
-      print "======================================"
+      print()
+      print("*** ANDROIDX SUPPORT LIBRARY PAGES ***")
+      print("======================================")
 
     elif source == "chrome":
       stem = "org/chromium/support_lib_boundary"
-      print
-      print "*** ANDROIDX CHROMIUM PAGES ***"
-      print "==============================="
+      print()
+      print("*** ANDROIDX CHROMIUM PAGES ***")
+      print("===============================")
 
   if (len(stem)>0):
     scan_files(stem)
-    print " *** DONE ***"
+    print(" *** DONE ***")
   else:
-      print 'You must specify one of: platform|androidx|support|chrome'
+      print('You must specify one of: platform|androidx|support|chrome')