openstack/python-glanceclient
Code Issues Proposed changes

Python 3: do not use __builtin__

Browse Source 
Use six.moves.builtins instead, this works with both Python 2 and 3.

Change-Id: I17cdf651edbf7907e2b8b3d6aec9ace8a76b0110
Closes-Bug: 1289107
This commit is contained in:
Cyril Roelandt 2014-03-07 04:06:29 +01:00
parent c18536eacb
commit 9b9b647c9d
1 changed files with 3 additions and 3 deletions

6
tests/test_shell.py

@ -136,7 +136,7 @@ class ShellCacheSchemaTest(utils.TestCase):
return Args(args)
@mock.patch('__builtin__.open', new=mock.mock_open(), create=True)
@mock.patch('six.moves.builtins.open', new=mock.mock_open(), create=True)
def test_cache_schema_gets_when_not_exists(self):
mocked_path_exists_result_lst = [True, False]
os.path.exists.side_effect = \
@ -154,7 +154,7 @@ class ShellCacheSchemaTest(utils.TestCase):
self.assertEqual(mock.call().write(json.dumps(self.schema_dict)),
open.mock_calls[2])
@mock.patch('__builtin__.open', new=mock.mock_open(), create=True)
@mock.patch('six.moves.builtins.open', new=mock.mock_open(), create=True)
def test_cache_schema_gets_when_forced(self):
os.path.exists.return_value = True
@ -170,7 +170,7 @@ class ShellCacheSchemaTest(utils.TestCase):
self.assertEqual(mock.call().write(json.dumps(self.schema_dict)),
open.mock_calls[2])
@mock.patch('__builtin__.open', new=mock.mock_open(), create=True)
@mock.patch('six.moves.builtins.open', new=mock.mock_open(), create=True)
def test_cache_schema_leaves_when_present_not_forced(self):
os.path.exists.return_value = True