UTAH

Merge lp:~doanac/utah/fix-rtfd-build into lp:utah

  1. fix-rtfd-build
  2. Merge into dev
Proposed by Andy Doan
Status: Merged
Merged at revision: 1025
Proposed branch: lp:~doanac/utah/fix-rtfd-build
Merge into: lp:utah
Diff against target: 17 lines (+5/-1)
1 file modified
utah/client/common.py (+5/-1)
To merge this branch: bzr merge lp:~doanac/utah/fix-rtfd-build
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+195117@code.launchpad.net

Description of the change

Fix a breakage in readthedocs generation:

 eg: https://readthedocs.org/builds/utah/953559/

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'utah/client/common.py'
2--- utah/client/common.py 2013-11-07 21:10:23 +0000
3+++ utah/client/common.py 2013-11-13 18:47:58 +0000
4@@ -281,8 +281,12 @@
5 raise YAMLParsingError(error_message)
6 return data
7
8+if os.environ.get('READTHEDOCS', None) == 'True':
9+ # readthedocs has a sandboxed environment, so we just need a stub
10+ # here so we can satisfy it
11+ DefaultValidator = object
12
13-if jsonschema.__version__ == '1.3.0':
14+elif jsonschema.__version__ == '1.3.0':
15 # Validator that sets values to defaults as explained in:
16 # https://github.com/Julian/jsonschema/issues/4
17 class DefaultValidator(jsonschema.Draft4Validator):

Subscribers

People subscribed via source and target branches

to all changes: