x/tuskar
Code Issues Proposed changes

Do not use __builtin__ in python3

Browse Source 
__builtin__ does not exist in Python 3, use
six.moves.builtins instead.

closes-bug: #1290234

Change-Id: Icb13e1d8e741b4d276140e2ca2eb9258225c3a3e
This commit is contained in:
Fengqian Gao 2014-03-10 15:39:05 +08:00
parent d40f3a629c
commit 6251923ed8
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/flakes.py
View File

@ -7,9 +7,10 @@
__all__ = ['main'] __all__ = ['main']
import __builtin__ as builtins
import sys import sys
import six.moves.builtins as builtins
import pyflakes.api import pyflakes.api
from pyflakes import checker from pyflakes import checker

2
tuskar/tests/__init__.py
View File

@ -30,5 +30,5 @@ eventlet.monkey_patch(os=False)
# See http://code.google.com/p/python-nose/issues/detail?id=373 # See http://code.google.com/p/python-nose/issues/detail?id=373
# The code below enables nosetests to work with i18n _() blocks # The code below enables nosetests to work with i18n _() blocks
import __builtin__ import six.moves.builtins as __builtin__
setattr(__builtin__, '_', lambda x: x) setattr(__builtin__, '_', lambda x: x)

2
tuskar/tests/test_utils.py
View File

@ -13,11 +13,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import __builtin__
import os import os
import os.path import os.path
import mox import mox
import six.moves.builtins as __builtin__
from tuskar.common import utils from tuskar.common import utils
from tuskar.tests import base from tuskar.tests import base