openstack/neutron
Code Issues Proposed changes

Python3: do not use __builtin__

Browse Source 
It has been replaced with builtins in Python 3. Use six.moves.builtins, since
it works with Python 2 and 3.

Change-Id: I9e1b0060a5b18116d991cafb1de085d4d084db38
Blueprint: neutron-python3
This commit is contained in:
Cyril Roelandt
2015-06-22 13:02:17 +00:00
parent 1b1d07823d
commit 0faf4a2645
9 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/tests/unit/agent/linux/test_daemon.py
View File

@@ -171,7 +171,7 @@ class TestPidfile(base.BaseTestCase):
self.assertEqual(34, p.read())
def test_is_running(self):
with mock.patch('__builtin__.open') as mock_open:
with mock.patch('six.moves.builtins.open') as mock_open:
p = daemon.Pidfile('thefile', 'python')
mock_open.return_value.__enter__ = lambda s: s
mock_open.return_value.__exit__ = mock.Mock()
@@ -184,7 +184,7 @@ class TestPidfile(base.BaseTestCase):
mock_open.assert_called_once_with('/proc/34/cmdline', 'r')
def test_is_running_uuid_true(self):
with mock.patch('__builtin__.open') as mock_open:
with mock.patch('six.moves.builtins.open') as mock_open:
p = daemon.Pidfile('thefile', 'python', uuid='1234')
mock_open.return_value.__enter__ = lambda s: s
mock_open.return_value.__exit__ = mock.Mock()
@@ -197,7 +197,7 @@ class TestPidfile(base.BaseTestCase):
mock_open.assert_called_once_with('/proc/34/cmdline', 'r')
def test_is_running_uuid_false(self):
with mock.patch('__builtin__.open') as mock_open:
with mock.patch('six.moves.builtins.open') as mock_open:
p = daemon.Pidfile('thefile', 'python', uuid='6789')
mock_open.return_value.__enter__ = lambda s: s
mock_open.return_value.__exit__ = mock.Mock()