Storm

Merge lp:~allenap/storm/json-property into lp:storm

  1. json-property
  2. Merge into trunk
Proposed by Gavin Panella
Status: Merged
Merged at revision: 399
Proposed branch: lp:~allenap/storm/json-property
Merge into: lp:storm
Prerequisite: lp:~jkakar/storm/json-property
Diff against target: 152 lines (+54/-9)
5 files modified
storm/compat.py (+32/-0)
storm/locals.py (+1/-7)
storm/variables.py (+8/-1)
tests/properties.py (+9/-0)
tests/variables.py (+4/-1)
To merge this branch: bzr merge lp:~allenap/storm/json-property
Reviewer Review Type Date Requested Status
Storm Developers Pending
Review via email: mp+74428@code.launchpad.net

Description of the change

This builds on Jamu's json-property branch (see the prerequisite) and fixes the things that Thomas requested.

To post a comment you must log in.
lp:~allenap/storm/json-property updated
399. By Gavin Panella

Merge lp:~jkakar/storm/json-property, resolving conflicts.

400. By Gavin Panella

Fall back to simplejson if json is not available, and degrade gracefully if no JSON support is available at all.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: