diff options
| author | James Saryerwinnie <js@jamesls.com> | 2012-10-22 15:10:45 -0700 |
|---|---|---|
| committer | James Saryerwinnie <js@jamesls.com> | 2012-10-22 15:41:15 -0700 |
| commit | 5fb324a20bb9c7ac991dfb85c8ef002684acce09 (patch) | |
| tree | 85237f046bd0bc6aa4507f76f5413495381c0c07 /boto/iam | |
| parent | 238458c8dfaf218fe2799f76d27d4b4627e6ad40 (diff) | |
| download | boto-5fb324a20bb9c7ac991dfb85c8ef002684acce09.tar.gz | |
Consolidate simplejson/json imports to a compat module
This remove duplication in modules that are checking for
simplejson, falling back to json when it doesn't exist.
I've updated the various modules that were importing
simplejson to now use this compat module.
The md5 module is another good candidate for moving
to the compat module
Diffstat (limited to 'boto/iam')
| -rw-r--r-- | boto/iam/connection.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/boto/iam/connection.py b/boto/iam/connection.py index 98276028..69c9bfeb 100644 --- a/boto/iam/connection.py +++ b/boto/iam/connection.py @@ -19,13 +19,9 @@ # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS # IN THE SOFTWARE. -try: - import json -except ImportError: - import simplejson as json - import boto import boto.jsonresponse +from boto.compat import json from boto.resultset import ResultSet from boto.iam.summarymap import SummaryMap from boto.connection import AWSQueryConnection |