openstack/swift
Code Issues Proposed changes

Remove simplejson from swift-recon

Browse Source 
Since we're dropping Python 2.6 support, we can rely on stdlib's json
and get rid of our dependency on simplejson.

All swift-recon was doing with json was decoding a JSON response (from
the recon middleware) and printing it to the terminal. This still
works just fine.

Change-Id: I28cf25a7c2856f230d4642c62fb8bf9c4d37e9e5
This commit is contained in:
Samuel Merritt 2015-05-26 16:43:55 -07:00
parent 15fd063ac3
commit a1c327022c
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swift/cli/recon.py
View File

@ -22,12 +22,9 @@ from eventlet.green import urllib2
from swift.common.utils import SWIFT_CONF_FILE from swift.common.utils import SWIFT_CONF_FILE
from swift.common.ring import Ring from swift.common.ring import Ring
from urlparse import urlparse from urlparse import urlparse
try:
import simplejson as json
except ImportError:
import json
from hashlib import md5 from hashlib import md5
import eventlet import eventlet
import json
import optparse import optparse
import time import time
import sys import sys