Sextant

Merge lp:~patrickas/ensoft-sextant/minor into lp:ensoft-sextant

  1. minor
  2. Merge into whiteline
Proposed by Patrick Stevens
Status: Merged
Approved by: Patrick Stevens
Approved revision: 23
Merged at revision: 23
Proposed branch: lp:~patrickas/ensoft-sextant/minor
Merge into: lp:ensoft-sextant
Diff against target: 36 lines (+4/-4)
1 file modified
src/sextant/web/server.py (+4/-4)
To merge this branch: bzr merge lp:~patrickas/ensoft-sextant/minor
Reviewer Review Type Date Requested Status
Patrick Stevens Approve
Review via email: mp+233506@code.launchpad.net

Commit message

Fix a bug which made Sextant Web fail to recognise two of its input queries

Description of the change

Fix a bug which made Sextant Web fail to recognise two of its input queries

To post a comment you must log in.
Revision history for this message
Patrick Stevens (patrickas) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/sextant/web/server.py'
2--- src/sextant/web/server.py 2014-09-03 15:59:44 +0000
3+++ src/sextant/web/server.py 2014-09-05 12:28:34 +0000
4@@ -113,7 +113,7 @@
5 request.finish()
6 defer.returnValue(None)
7
8- allowed_queries = ("whole_program", "functions_calling", "functions_called_by", "call_paths", "shortest_path")
9+ allowed_queries = ("whole_program", "functions_calling", "functions_called_by", "all_call_paths", "shortest_call_path")
10
11 if "query" not in request.args:
12 query = "whole_program"
13@@ -151,7 +151,7 @@
14 if 'func1' not in request.args:
15 # raise 400 Bad Request error
16 request.setResponseCode(400)
17- request.write("Supply 'func1' parameter to call_paths.")
18+ request.write("Supply 'func1' parameter to all_call_paths.")
19 request.finish()
20 defer.returnValue(None)
21 if 'func2' not in request.args:
22@@ -168,13 +168,13 @@
23 if 'func1' not in request.args:
24 # raise 400 Bad Request error
25 request.setResponseCode(400)
26- request.write("Supply 'func1' parameter to shortest_path.")
27+ request.write("Supply 'func1' parameter to shortest_call_path.")
28 request.finish()
29 defer.returnValue(None)
30 if 'func2' not in request.args:
31 # raise 400 Bad Request error
32 request.setResponseCode(400)
33- request.write("Supply 'func2' parameter to shortest_path.")
34+ request.write("Supply 'func2' parameter to shortest_call_path.")
35 request.finish()
36 defer.returnValue(None)
37

Subscribers

People subscribed via source and target branches