Bug 1547730 - Compensate for __builtin__ use in files accessed by py3 r=#build
☠☠ backed out by ee4b88439111 ☠ ☠
authorJustin Wood <Callek@gmail.com>
Mon, 15 Apr 2019 14:11:33 -0400
changeset 474067 1891cfbb55d1570132882c3adda6ad8d80e08cc4
parent 474066 16b1c53aba9d757d50fcd88b91f937266296dd26
child 474068 3df74540bde34a0514c2b98bab05152d2b1cffed
push id113124
push userCallek@gmail.com
push dateThu, 16 May 2019 11:58:33 +0000
treeherdermozilla-inbound@9e9c2e06d0fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1547730
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1547730 - Compensate for __builtin__ use in files accessed by py3 r=#build Differential Revision: https://phabricator.services.mozilla.com/D28105
python/mozbuild/mozbuild/configure/__init__.py
--- a/python/mozbuild/mozbuild/configure/__init__.py
+++ b/python/mozbuild/mozbuild/configure/__init__.py
@@ -1,20 +1,20 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-import __builtin__
 import inspect
 import logging
 import os
 import re
 import six
+from six.moves import builtins as __builtin__
 import sys
 import types
 from collections import OrderedDict
 from contextlib import contextmanager
 from functools import wraps
 from mozbuild.configure.options import (
     CommandLineHelper,
     ConflictingOptionError,