Bug 1562462 - Revert py-2to3 changes on py3 files from bug 1559975. NPOTB

Differential Revision: https://phabricator.services.mozilla.com/D40353

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Jeff Gilbert 2019-08-02 00:48:06 +00:00
parent f5feaeaf1c
commit b29b969839
2 changed files with 6 additions and 8 deletions

View File

@ -1,5 +1,4 @@
#! /usr/bin/env python3
from __future__ import print_function
assert __name__ == '__main__'
'''
@ -85,7 +84,7 @@ GN_ENV['DEPOT_TOOLS_WIN_TOOLCHAIN'] = '0'
# ------------------------------------------------------------------------------
def run_checked(*args, **kwargs):
print((' ', args))
print(' ', args)
sys.stdout.flush()
return subprocess.run(args, check=True, **kwargs)
@ -294,7 +293,7 @@ def gather_libraries(roots: Sequence[str], descs: dict) -> Set[str]:
libraries = set()
def fn(target_name):
cur = descs[target_name]
print((' ' + cur['type'], target_name))
print(' ' + cur['type'], target_name)
assert has_all_includes(target_name, descs), target_name
if cur['type'] in ('shared_library', 'static_library'):
@ -309,7 +308,7 @@ def gather_libraries(roots: Sequence[str], descs: dict) -> Set[str]:
libraries = gather_libraries(ROOTS, descs)
print(f'\n{len(libraries)} libraries:')
for k in libraries:
print((' ', k))
print(' ', k)
if CHECK_ONLY:
print('\n--check complete.')
@ -571,7 +570,7 @@ def export_target(target_name) -> Set[str]:
# Write it out
mozbuild = target_dir / 'moz.build'
print((' ', ' ', f'Writing {mozbuild}'))
print(' ', ' ', f'Writing {mozbuild}')
data = b'\n'.join((x.encode() for x in lines))
mozbuild.write_bytes(data)

View File

@ -1,5 +1,4 @@
#! /usr/bin/env python3
from __future__ import print_function
assert __name__ != '__main__'
'''
@ -17,12 +16,12 @@ import sys
# --
def print_now(*args):
print((*args))
print(*args)
sys.stdout.flush()
def run_checked(*args, **kwargs):
print((' ', args))
print(' ', args)
sys.stdout.flush()
return subprocess.run(args, check=True, **kwargs)