Convert process_compat_config to python 3 am: da86959d7b am: b95693c1fe am: 614a270efc am: 0477267870 am: 965fe11a12

Original change: https://android-review.googlesource.com/c/tools/platform-compat/+/2057087

Change-Id: I42b78ba51bb1e77de8bfe32715516efcac73a364
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 6 insertions, 23 deletions

diff --git a/build/Android.bp b/build/Android.bp
index b6aedec..445718e 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -22,14 +22,6 @@ python_binary_host {
     name: "process-compat-config",
     main: "process_compat_config.py",
     srcs: ["process_compat_config.py"],
-    version: {
-        py2: {
-            enabled: true,
-        },
-        py3: {
-            enabled: false,
-        },
-    },
 }
 
 python_test_host {
@@ -39,14 +31,6 @@ python_test_host {
         "process_compat_config.py",
         "process-compat-config-test.py",
     ],
-    version: {
-        py2: {
-            enabled: true,
-        },
-        py3: {
-            enabled: false,
-        },
-    },
     test_options: {
         unit_test: true,
     },
diff --git a/build/process-compat-config-test.py b/build/process-compat-config-test.py
index 832bca9..c7b4ac8 100644
--- a/build/process-compat-config-test.py
+++ b/build/process-compat-config-test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2019 The Android Open Source Project
 #
@@ -18,7 +18,6 @@
 
 import difflib
 import io
-from StringIO import StringIO
 import unittest
 import xml.dom.minidom
 from inspect import currentframe, getframeinfo
@@ -33,7 +32,7 @@ class ProcessCompatConfigTest(unittest.TestCase):
 
     def setUp(self):
         self.merger = process_compat_config.ConfigMerger(detect_conflicts = True)
-        self.stderr = StringIO()
+        self.stderr = io.StringIO()
         self.merger.write_errors_to = self.stderr
         self.xml = io.BytesIO()
 
@@ -85,14 +84,14 @@ class ProcessCompatConfigTest(unittest.TestCase):
         self.merger.merge(io.BytesIO(b'<config><compat-change id="1234" name="TEST_CHANGE" /></config>'), here())
         self.merger.merge(io.BytesIO(b'<config><compat-change id="1234" name="TEST_CHANGE2" /></config>'), here())
         self.assertIn(r'ERROR: Duplicate definitions for compat change with ID 1234', self.stderr.getvalue())
-        with self.assertRaisesRegexp(Exception, ' 1 .*error'):
+        with self.assertRaisesRegex(Exception, ' 1 .*error'):
             self.merger.write(self.xml)
 
     def test_merge_two_files_duplicate_name(self):
         self.merger.merge(io.BytesIO(b'<config><compat-change id="1234" name="TEST_CHANGE" /></config>'), here())
         self.merger.merge(io.BytesIO(b'<config><compat-change id="1235" name="TEST_CHANGE" /></config>'), here())
         self.assertIn(r'ERROR: Duplicate definitions for compat change with name TEST_CHANGE', self.stderr.getvalue())
-        with self.assertRaisesRegexp(Exception, ' 1 .*error'):
+        with self.assertRaisesRegex(Exception, ' 1 .*error'):
             self.merger.write(self.xml)
 
     def test_merge_two_files_duplicate_id_allow_duplicates(self):
@@ -108,4 +107,4 @@ class ProcessCompatConfigTest(unittest.TestCase):
         self.merger.write(self.xml)
 
 if __name__ == '__main__':
-  unittest.main(verbosity=2)
\ No newline at end of file
+  unittest.main(verbosity=2)
diff --git a/build/process_compat_config.py b/build/process_compat_config.py
index 10befb7..f884092 100755
--- a/build/process_compat_config.py
+++ b/build/process_compat_config.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright (C) 2020 The Android Open Source Project
 #