Bug 1547730 - Compensate for __builtin__ use in files accessed by py3 r=glandium
authorJustin Wood <Callek@gmail.com>
Tue, 28 May 2019 14:25:30 +0000
changeset 475885 d74097a6c6c52c00f034c08796a99786f7698302
parent 475884 47e737a70bea7123ac7afbd69925a7819254e0c7
child 475886 2dafc77a00b283ac6dcf51f4d11be4f79520cb69
push id36076
push useropoprus@mozilla.com
push dateTue, 28 May 2019 21:44:47 +0000
treeherdermozilla-central@c3f75e081427 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1547730
milestone69.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=glandium 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,