Merge "Remove unused fallback to simplejson"
This commit is contained in:
commit
e313864402
@ -7,7 +7,6 @@ iso8601>=0.1.11 # MIT
|
||||
netaddr>=0.7.18 # BSD
|
||||
requests>=2.14.2 # Apache-2.0
|
||||
python-keystoneclient>=3.8.0 # Apache-2.0
|
||||
simplejson>=3.5.1 # MIT
|
||||
stevedore>=1.20.0 # Apache-2.0
|
||||
Babel!=2.4.0,>=2.3.4 # BSD
|
||||
oslo.i18n>=3.15.3 # Apache-2.0
|
||||
|
@ -14,10 +14,7 @@
|
||||
# under the License.
|
||||
#
|
||||
|
||||
try:
|
||||
import json
|
||||
except ImportError:
|
||||
import simplejson as json
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user