Merge "Update httplib to use python3 compatible code"
This commit is contained in:
commit
c77dfec012
|
@ -5,7 +5,7 @@
|
||||||
#
|
#
|
||||||
import json
|
import json
|
||||||
import urllib2
|
import urllib2
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
|
|
||||||
|
|
||||||
def request(token_id, method, api_cmd, api_cmd_headers=None, api_cmd_payload=None):
|
def request(token_id, method, api_cmd, api_cmd_headers=None, api_cmd_payload=None):
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
|
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import kubernetes
|
import kubernetes
|
||||||
from kubernetes.client.rest import ApiException
|
from kubernetes.client.rest import ApiException
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
|
|
||||||
from nfv_common import debug
|
from nfv_common import debug
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import collections
|
import collections
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import json
|
import json
|
||||||
import six
|
import six
|
||||||
import socket
|
import socket
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import json
|
import json
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
|
|
||||||
from nfv_common import debug
|
from nfv_common import debug
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import uuid
|
import uuid
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
|
|
||||||
from nfv_common import debug
|
from nfv_common import debug
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
|
|
||||||
from nfv_common import debug
|
from nfv_common import debug
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import json
|
import json
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import os
|
import os
|
||||||
|
|
||||||
from nfv_common import debug
|
from nfv_common import debug
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
|
|
||||||
from nfv_common import debug
|
from nfv_common import debug
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
|
|
||||||
from nfv_common import debug
|
from nfv_common import debug
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
import socket
|
import socket
|
||||||
|
|
|
@ -7,7 +7,7 @@ import argparse
|
||||||
import config
|
import config
|
||||||
import time
|
import time
|
||||||
import socket
|
import socket
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
|
|
||||||
from nfv_plugins.nfvi_plugins.openstack import openstack
|
from nfv_plugins.nfvi_plugins.openstack import openstack
|
||||||
from nfv_plugins.nfvi_plugins.openstack import ceilometer
|
from nfv_plugins.nfvi_plugins.openstack import ceilometer
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import pecan
|
import pecan
|
||||||
from pecan import rest
|
from pecan import rest
|
||||||
from wsme import types as wsme_types
|
from wsme import types as wsme_types
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import pecan
|
import pecan
|
||||||
from pecan import rest
|
from pecan import rest
|
||||||
from wsme import types as wsme_types
|
from wsme import types as wsme_types
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import pecan
|
import pecan
|
||||||
from pecan import rest
|
from pecan import rest
|
||||||
from wsme import types as wsme_types
|
from wsme import types as wsme_types
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import pecan
|
import pecan
|
||||||
from pecan import rest
|
from pecan import rest
|
||||||
from wsme import types as wsme_types
|
from wsme import types as wsme_types
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import pecan
|
import pecan
|
||||||
from pecan import rest
|
from pecan import rest
|
||||||
from wsme import types as wsme_types
|
from wsme import types as wsme_types
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import json
|
import json
|
||||||
import pecan
|
import pecan
|
||||||
from pecan import rest
|
from pecan import rest
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import pecan
|
import pecan
|
||||||
from pecan import rest
|
from pecan import rest
|
||||||
from wsme import types as wsme_types
|
from wsme import types as wsme_types
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import json
|
import json
|
||||||
import pecan
|
import pecan
|
||||||
from wsme import types as wsme_types
|
from wsme import types as wsme_types
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import pecan
|
import pecan
|
||||||
from pecan import rest
|
from pecan import rest
|
||||||
from wsme import types as wsme_types
|
from wsme import types as wsme_types
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import json
|
import json
|
||||||
import pecan
|
import pecan
|
||||||
from pecan import rest
|
from pecan import rest
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import pecan
|
import pecan
|
||||||
from wsme import types as wsme_types
|
from wsme import types as wsme_types
|
||||||
import wsmeext.pecan as wsme_pecan
|
import wsmeext.pecan as wsme_pecan
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import pecan
|
import pecan
|
||||||
|
|
||||||
from nfv_common import debug
|
from nfv_common import debug
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import json
|
import json
|
||||||
import pecan
|
import pecan
|
||||||
from wsme import types as wsme_types
|
from wsme import types as wsme_types
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#
|
#
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import urllib2
|
import urllib2
|
||||||
|
|
||||||
from nfv_common import debug
|
from nfv_common import debug
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
#
|
#
|
||||||
import datetime
|
import datetime
|
||||||
import httplib
|
from six.moves import http_client as httplib
|
||||||
import json
|
import json
|
||||||
import re
|
import re
|
||||||
import socket
|
import socket
|
||||||
|
|
Loading…
Reference in New Issue