boto/boto — pull request #1645 by danielgtaylor (2013-08-01 20:56:16+00:00)
Title: Handle both JSONDecodeError and ValueError due to differences in json vs. simplejson

This merges in #1633 from @kurin, but makes the following changes:

1. Catches both `JSONDecodeError` and `ValueError`
2. Adds a new test to verify behavior if either exception is thrown