Merge "Remove unused fallback to simplejson"
This commit is contained in:
commit
81a6784045
@ -15,6 +15,7 @@
|
||||
|
||||
import copy
|
||||
import io
|
||||
import json
|
||||
import logging
|
||||
import socket
|
||||
|
||||
@ -26,11 +27,6 @@ from oslo_utils import netutils
|
||||
import requests
|
||||
import urllib.parse
|
||||
|
||||
try:
|
||||
import json
|
||||
except ImportError:
|
||||
import simplejson as json
|
||||
|
||||
from oslo_utils import encodeutils
|
||||
|
||||
from glanceclient.common import utils
|
||||
|
Loading…
Reference in New Issue
Block a user