Skip to content
This repository has been archived by the owner on May 10, 2024. It is now read-only.

Handle both JSONDecodeError and ValueError due to differences in json vs. simplejson #1645

Merged
merged 4 commits into from Aug 2, 2013
Merged

Handle both JSONDecodeError and ValueError due to differences in json vs. simplejson #1645

merged 4 commits into from Aug 2, 2013

Commits on Aug 1, 2013

  1. Replace JSONDecodeError with ValueError 

    simplejson has JSONDecodeError, but json doesn't.
    @kurin @danielgtaylor
    kurin authored and danielgtaylor committed Aug 1, 2013
    Configuration menu
    Copy the full SHA
    d5a5c01 View commit details
    Browse the repository at this point in the history

  2. Catch both JSONDecodeError and ValueError and add a unit test to conf… 

    …irm that both are caught and the expected service exception gets raised.
    @danielgtaylor
    danielgtaylor committed Aug 1, 2013
    Configuration menu
    Copy the full SHA
    954a50c View commit details
    Browse the repository at this point in the history

  3. Actually, we really only do need to catch ValueError. James pointed o… 

    …ut that JSONDecodeError inherits from ValueError. Tests continue to pass.
    @danielgtaylor
    danielgtaylor committed Aug 1, 2013
    Configuration menu
    Copy the full SHA
    915d8ff View commit details
    Browse the repository at this point in the history

  4. Use assertRaises instead of try/except blocks for unit tests

    @danielgtaylor
    danielgtaylor committed Aug 1, 2013
    Configuration menu
    Copy the full SHA
    4407fcb View commit details
    Browse the repository at this point in the history