diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-27 01:58:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-27 01:58:34 +0000 |
| commit | 79c65615e0dbd55d8a1ccc0f59d9527cdca523e8 (patch) | |
| tree | fcfceca0fbb3a137f0647e736ffa4a8cb0a31fc5 | |
| parent | a719472d948617939bc9374f8aa5b488ff76c478 (diff) | |
| parent | daf7998996abf18f873ce1a5d2a65846a808b356 (diff) | |
| download | ironic-79c65615e0dbd55d8a1ccc0f59d9527cdca523e8.tar.gz | |
Merge "Do not use __builtin__ in python3"
| -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 |