openstack/keystone
Code Issues Proposed changes

Do not use __builtin__ in python3

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

Change-Id: Idcaa582190fbb655f7e3e965a3a165137bdd9e3c
Closes-Bug: #1290234
This commit is contained in:
Ravi Shekhar Jethani
2015-12-31 01:36:37 -08:00
parent 7a5a7304ab
commit 3db7564fb7
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
keystone/tests/unit/test_cli.py
View File

@@ -240,7 +240,7 @@ class CliDomainConfigSingleDomainTestCase(CliDomainConfigAllTestCase):
# Now try and upload the settings in the configuration file for the
# default domain
dependency.reset()
with mock.patch('__builtin__.print') as mock_print:
with mock.patch('six.moves.builtins.print') as mock_print:
self.assertRaises(SystemExit, cli.DomainConfigUpload.main)
file_name = ('keystone.%s.conf' %
resource.calc_default_domain()['name'])
@@ -266,7 +266,7 @@ class CliDomainConfigNoOptionsTestCase(CliDomainConfigAllTestCase):
def test_config_upload(self):
dependency.reset()
with mock.patch('__builtin__.print') as mock_print:
with mock.patch('six.moves.builtins.print') as mock_print:
self.assertRaises(SystemExit, cli.DomainConfigUpload.main)
mock_print.assert_has_calls(
[mock.call(
@@ -283,7 +283,7 @@ class CliDomainConfigTooManyOptionsTestCase(CliDomainConfigAllTestCase):
def test_config_upload(self):
dependency.reset()
with mock.patch('__builtin__.print') as mock_print:
with mock.patch('six.moves.builtins.print') as mock_print:
self.assertRaises(SystemExit, cli.DomainConfigUpload.main)
mock_print.assert_has_calls(
[mock.call(_('The --all option cannot be used with '
@@ -300,7 +300,7 @@ class CliDomainConfigInvalidDomainTestCase(CliDomainConfigAllTestCase):
def test_config_upload(self):
dependency.reset()
with mock.patch('__builtin__.print') as mock_print:
with mock.patch('six.moves.builtins.print') as mock_print:
self.assertRaises(SystemExit, cli.DomainConfigUpload.main)
file_name = 'keystone.%s.conf' % self.invalid_domain_name
error_msg = (_(

1
tox.ini
View File

@@ -46,6 +46,7 @@ commands =
keystone/tests/unit/test_backend.py \
keystone/tests/unit/test_backend_rules.py \
keystone/tests/unit/test_backend_sql.py \
keystone/tests/unit/test_cli.py \
keystone/tests/unit/test_config.py \
keystone/tests/unit/test_contrib_ec2.py \
keystone/tests/unit/test_contrib_s3_core.py \