openstack/neutron
Code Issues Proposed changes

Use six.StringIO/BytesIO instead of StringIO.StringIO

Browse Source 
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
This commit is contained in:
He Yongli 2014-02-17 10:28:03 +08:00
parent b2ac45e71c
commit 9bd6754b57
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/agent/linux/dhcp.py
View File

@ -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:

6
neutron/tests/unit/test_policy.py
View File

@ -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"