From 9bd6754b573e362a11d3536873ae818e3e910cb6 Mon Sep 17 00:00:00 2001 From: He Yongli Date: Mon, 17 Feb 2014 10:28:03 +0800 Subject: [PATCH] Use six.StringIO/BytesIO instead of StringIO.StringIO to keep Python 3.x compatibility, use six.StringIO/BytesIO to replace StringIO.StringIO StringIO works for unicode BytesIO works for bytes Change-Id: I3892098e31d8d6984d58136110aae653dc4047ab Closes-Bug: #1280100 --- neutron/agent/linux/dhcp.py | 3 +-- neutron/tests/unit/test_policy.py | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/neutron/agent/linux/dhcp.py b/neutron/agent/linux/dhcp.py index f3d8e8146..8850306e7 100644 --- a/neutron/agent/linux/dhcp.py +++ b/neutron/agent/linux/dhcp.py @@ -21,7 +21,6 @@ import os import re import shutil import socket -import StringIO import sys import uuid @@ -413,7 +412,7 @@ class Dnsmasq(DhcpLocalProcess): def _output_hosts_file(self): """Writes a dnsmasq compatible hosts file.""" r = re.compile('[:.]') - buf = StringIO.StringIO() + buf = six.StringIO() for port in self.network.ports: for alloc in port.fixed_ips: diff --git a/neutron/tests/unit/test_policy.py b/neutron/tests/unit/test_policy.py index 22a7ccad6..81fe7dfad 100644 --- a/neutron/tests/unit/test_policy.py +++ b/neutron/tests/unit/test_policy.py @@ -16,11 +16,11 @@ """Test of Policy Engine For Neutron""" import json -import StringIO import urllib2 import fixtures import mock +import six import neutron from neutron.api.v2 import attributes @@ -120,7 +120,7 @@ class PolicyTestCase(base.BaseTestCase): def test_enforce_http_true(self): def fakeurlopen(url, post_data): - return StringIO.StringIO("True") + return six.StringIO("True") with mock.patch.object(urllib2, 'urlopen', new=fakeurlopen): action = "example:get_http" @@ -131,7 +131,7 @@ class PolicyTestCase(base.BaseTestCase): def test_enforce_http_false(self): def fakeurlopen(url, post_data): - return StringIO.StringIO("False") + return six.StringIO("False") with mock.patch.object(urllib2, 'urlopen', new=fakeurlopen): action = "example:get_http" -- 2.45.2