summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-07-03 17:13:53 +0000
committerGerrit Code Review <review@openstack.org>2014-07-03 17:13:53 +0000
commite43c0f2b9b8b1e75959179646c212fdaf3d00265 (patch)
tree57f855aac3d08987f394b0ec7d98c3bc6e3b8250 /openstackclient
parent8e12949958143e7db9783ef6246e6b09def0ad8e (diff)
parent169587ddbd5b67258fe91e6d0428f371b9cf312e (diff)
downloadpython-openstackclient-e43c0f2b9b8b1e75959179646c212fdaf3d00265.tar.gz
Merge "Python 3: do not use __builtin__"
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/tests/image/v1/test_image.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/openstackclient/tests/image/v1/test_image.py b/openstackclient/tests/image/v1/test_image.py
index b746a538..b014482a 100644
--- 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'),