Merge "Python 3: do not use __builtin__"

2014-07-03 17:13:53 +00:00 · 2014-07-03 17:13:53 +00:00 · e43c0f2b9b
commit e43c0f2b9b
parent 8e12949958 169587ddbd
1 changed files with 1 additions and 1 deletions
--- a/openstackclient/tests/image/v1/test_image.py
+++ b/openstackclient/tests/image/v1/test_image.py
@ -139,7 +139,7 @@ class TestImageCreate(TestImage):
        self.assertEqual(image_fakes.IMAGE_columns, columns)
        self.assertEqual(image_fakes.IMAGE_data, data)

-    @mock.patch('__builtin__.open')
+    @mock.patch('six.moves.builtins.open')
    def test_image_create_file(self, open_mock):
        mock_exception = {
            'find.side_effect': exceptions.CommandError('x'),