diff options
| author | yangxurong <yangxurong@huawei.com> | 2014-03-13 10:00:11 +0800 |
|---|---|---|
| committer | yangxurong <yangxurong@huawei.com> | 2014-03-13 11:34:16 +0800 |
| commit | daf7998996abf18f873ce1a5d2a65846a808b356 (patch) | |
| tree | 4423504b8be5286999dbf4601f9c7141fd748c73 | |
| parent | 287fe8478ab47221fa1c6a40e10cfd79e4022709 (diff) | |
| download | ironic-daf7998996abf18f873ce1a5d2a65846a808b356.tar.gz | |
Do not use __builtin__ in python3
__builtin__ does not exist in Python 3, use
six.moves.builtins instead.
Change-Id: I79b61b5ab67f491ce88015f799ff7d66c9eeb7ee
closes-bug: #1290234
| -rw-r--r-- | ironic/tests/__init__.py | 2 | ||||
| -rw-r--r-- | ironic/tests/test_utils.py | 2 | ||||
| -rw-r--r-- | tools/flakes.py | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/ironic/tests/__init__.py b/ironic/tests/__init__.py index e45f578f1..918237d30 100644 --- a/ironic/tests/__init__.py +++ b/ironic/tests/__init__.py @@ -30,5 +30,5 @@ eventlet.monkey_patch(os=False) # See http://code.google.com/p/python-nose/issues/detail?id=373 # The code below enables nosetests to work with i18n _() blocks -import __builtin__ +import six.moves.builtins as __builtin__ setattr(__builtin__, '_', lambda x: x) diff --git a/ironic/tests/test_utils.py b/ironic/tests/test_utils.py index ae030b57b..34ad26fc2 100644 --- a/ironic/tests/test_utils.py +++ b/ironic/tests/test_utils.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -import __builtin__ import errno import hashlib import os @@ -25,6 +24,7 @@ import mock import netaddr from oslo.config import cfg import six +import six.moves.builtins as __builtin__ from ironic.common import exception from ironic.common import utils diff --git a/tools/flakes.py b/tools/flakes.py index 191bd6eab..6869a4477 100644 --- a/tools/flakes.py +++ b/tools/flakes.py @@ -7,9 +7,8 @@ __all__ = ['main'] -import __builtin__ as builtins import sys - +import six.moves.builtins as builtins import pyflakes.api from pyflakes import checker |