openstack/deb-ryu
Code Issues Proposed changes

python3: Fix starndard library imports

Browse Source 
Generated by runnig "2to3 -f imports".

Signed-off-by: IWAMOTO Toshihiro <iwamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
IWAMOTO Toshihiro 2015-06-20 00:10:25 +09:00 committed by FUJITA Tomonori
parent 6adf399345
commit c3c2112cb1
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ryu/app/client.py
View File

@ -18,9 +18,9 @@
# This module is *not* used by ryu-manager. # This module is *not* used by ryu-manager.
# Imported and used by OpenStack Ryu plug-in and agent. # Imported and used by OpenStack Ryu plug-in and agent.
import httplib import http.client
import json import json
import urlparse import urllib.parse
def ignore_http_not_found(func): def ignore_http_not_found(func):
@ -30,9 +30,9 @@ def ignore_http_not_found(func):
""" """
try: try:
func() func()
except httplib.HTTPException as e: except http.client.HTTPException as e:
res = e.args[0] res = e.args[0]
if res.status != httplib.NOT_FOUND: if res.status != http.client.NOT_FOUND:
raise raise
@ -40,13 +40,13 @@ class RyuClientBase(object):
def __init__(self, version, address): def __init__(self, version, address):
super(RyuClientBase, self).__init__() super(RyuClientBase, self).__init__()
self.version = version self.version = version
res = urlparse.SplitResult('', address, '', '', '') res = urllib.parse.SplitResult('', address, '', '', '')
self.host = res.hostname self.host = res.hostname
self.port = res.port self.port = res.port
self.url_prefix = '/' + self.version + '/' self.url_prefix = '/' + self.version + '/'
def _do_request(self, method, action, body=None): def _do_request(self, method, action, body=None):
conn = httplib.HTTPConnection(self.host, self.port) conn = http.client.HTTPConnection(self.host, self.port)
url = self.url_prefix + action url = self.url_prefix + action
headers = {} headers = {}
if body is not None: if body is not None:
@ -54,13 +54,13 @@ class RyuClientBase(object):
headers['Content-Type'] = 'application/json' headers['Content-Type'] = 'application/json'
conn.request(method, url, body, headers) conn.request(method, url, body, headers)
res = conn.getresponse() res = conn.getresponse()
if res.status in (httplib.OK, if res.status in (http.client.OK,
httplib.CREATED, http.client.CREATED,
httplib.ACCEPTED, http.client.ACCEPTED,
httplib.NO_CONTENT): http.client.NO_CONTENT):
return res return res
raise httplib.HTTPException( raise http.client.HTTPException(
res, 'code %d reason %s' % (res.status, res.reason), res, 'code %d reason %s' % (res.status, res.reason),
res.getheaders(), res.read()) res.getheaders(), res.read())

10
ryu/app/rest_conf_switch.py
View File

@ -21,7 +21,7 @@ This module provides a set of REST API for switch configuration.
Used by OpenStack Ryu agent. Used by OpenStack Ryu agent.
""" """
import httplib import http.client
import json import json
import logging import logging
from webob import Response from webob import Response
@ -72,7 +72,7 @@ class ConfSwitchController(ControllerBase):
try: try:
ret = func(dpid) ret = func(dpid)
except KeyError: except KeyError:
return Response(status=httplib.NOT_FOUND, return Response(status=http.client.NOT_FOUND,
body='no dpid is found %s' % body='no dpid is found %s' %
dpid_lib.dpid_to_str(dpid)) dpid_lib.dpid_to_str(dpid))
@ -84,7 +84,7 @@ class ConfSwitchController(ControllerBase):
return None return None
def _ret(_ret): def _ret(_ret):
return Response(status=httplib.ACCEPTED) return Response(status=http.client.ACCEPTED)
return self._do_switch(dpid, _delete_switch, _ret) return self._do_switch(dpid, _delete_switch, _ret)
@ -104,7 +104,7 @@ class ConfSwitchController(ControllerBase):
try: try:
ret = func(dpid, key) ret = func(dpid, key)
except KeyError: except KeyError:
return Response(status=httplib.NOT_FOUND, return Response(status=http.client.NOT_FOUND,
body='no dpid/key is found %s %s' % body='no dpid/key is found %s %s' %
(dpid_lib.dpid_to_str(dpid), key)) (dpid_lib.dpid_to_str(dpid), key))
return ret_func(ret) return ret_func(ret)
@ -116,7 +116,7 @@ class ConfSwitchController(ControllerBase):
return None return None
def _ret(_ret): def _ret(_ret):
return Response(status=httplib.CREATED) return Response(status=http.client.CREATED)
return self._do_key(dpid, key, _set_val, _ret) return self._do_key(dpid, key, _set_val, _ret)

4
ryu/services/protocols/bgp/operator/commands/show/route_formatter_mixin.py
View File

@ -1,4 +1,4 @@
import StringIO import io
class RouteFormatterMixin(object): class RouteFormatterMixin(object):
@ -17,7 +17,7 @@ class RouteFormatterMixin(object):
@classmethod @classmethod
def _format_family(cls, dest_list): def _format_family(cls, dest_list):
msg = StringIO.StringIO() msg = io.StringIO()
def _append_path_info(buff, path, is_best, show_prefix): def _append_path_info(buff, path, is_best, show_prefix):
aspath = path.get('aspath') aspath = path.get('aspath')