openstack/python-glanceclient
Code Issues Proposed changes

Merge "Remove code needed for python2.5"

Browse Source
This commit is contained in:
Jenkins
2016-02-05 04:09:25 +00:00
committed by Gerrit Code Review
parent cc36f34480 b4a2e28295
commit 6c846a43aa
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glanceclient/common/http.py
View File

@@ -23,7 +23,6 @@ from oslo_utils import importutils
from oslo_utils import netutils from oslo_utils import netutils
import requests import requests
import six import six
from six.moves.urllib import parse
import warnings import warnings
try: try:
@@ -31,11 +30,6 @@ try:
except ImportError: except ImportError:
import simplejson as json import simplejson as json
# Python 2.5 compat fix
if not hasattr(parse, 'parse_qsl'):
import cgi
parse.parse_qsl = cgi.parse_qsl
from oslo_utils import encodeutils from oslo_utils import encodeutils
from glanceclient.common import utils from glanceclient.common import utils