Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf8814cd authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by Gerrit Code Review
Browse files

Merge "Use python3"

parents 5e5b5203 7cc0e15e
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
#!/usr/bin/python
#!/usr/bin/env python3
#
# Copyright (C) 2019 The Android Open Source Project
#
@@ -28,7 +28,7 @@ import sys

def main():
  os.environ['PYTHONPATH'] = os.path.dirname(os.path.abspath(__file__))
  subprocess.check_call(['/usr/bin/python', '-m', 'warn.warn'] + sys.argv[1:])
  subprocess.check_call(['/usr/bin/python3', '-m', 'warn.warn'] + sys.argv[1:])


if __name__ == '__main__':
+2 −5
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@
#   emit_js_data():

from __future__ import print_function
import cgi
import csv
import html
import sys

# pylint:disable=relative-beyond-top-level
@@ -582,10 +582,7 @@ def emit_const_string_array(name, array, writer):
def emit_const_html_string_array(name, array, writer):
  writer('const ' + name + ' = [')
  for s in array:
    # Not using html.escape yet, to work for both python 2 and 3,
    # until all users switch to python 3.
    # pylint:disable=deprecated-method
    writer('"' + cgi.escape(strip_escape_string(s)) + '",')
    writer('"' + html.escape(strip_escape_string(s)) + '",')
  writer('];')


+1 −1
Original line number Diff line number Diff line
#!/usr/bin/python
#!/usr/bin/env python3
#
# Copyright (C) 2019 The Android Open Source Project
#