|
5 | 5 | <head> |
6 | 6 | <meta charset="utf-8" /> |
7 | 7 | <meta name="viewport" content="width=device-width, initial-scale=1.0" /> |
8 | | - <title>dataretrieval.nldi — dataretrieval 0.1.dev1+g01c7fc706 documentation</title> |
| 8 | + <title>dataretrieval.nldi — dataretrieval 0.1.dev1+g11dd5a29f documentation</title> |
9 | 9 | <link rel="stylesheet" type="text/css" href="../../_static/pygments.css?v=b86133f3" /> |
10 | 10 | <link rel="stylesheet" type="text/css" href="../../_static/css/theme.css?v=9edc463e" /> |
11 | 11 |
|
12 | 12 |
|
13 | 13 | <script src="../../_static/jquery.js?v=5d32c60e"></script> |
14 | 14 | <script src="../../_static/_sphinx_javascript_frameworks_compat.js?v=2cd50e6c"></script> |
15 | | - <script src="../../_static/documentation_options.js?v=c20e88bd"></script> |
| 15 | + <script src="../../_static/documentation_options.js?v=fa6b1573"></script> |
16 | 16 | <script src="../../_static/doctools.js?v=fd6eb6e6"></script> |
17 | 17 | <script src="../../_static/sphinx_highlight.js?v=6ffebe34"></script> |
18 | 18 | <script crossorigin="anonymous" integrity="sha256-Ae2Vz/4ePdIu6ZyI/5ZGsYnb+m0JlOmKPjt6XZ9JJkA=" src="https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js"></script> |
@@ -335,9 +335,9 @@ <h1>Source code for dataretrieval.nldi</h1><div class="highlight"><pre> |
335 | 335 | <span class="s2">"navigation_mode is required if comid or data_source is provided"</span> |
336 | 336 | <span class="p">)</span> |
337 | 337 | <span class="n">_validate_feature_source_comid</span><span class="p">(</span><span class="n">feature_source</span><span class="p">,</span> <span class="n">feature_id</span><span class="p">,</span> <span class="n">comid</span><span class="p">)</span> |
338 | | - <span class="k">if</span> <span class="n">data_source</span><span class="p">:</span> |
| 338 | + <span class="k">if</span> <span class="n">data_source</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span> |
339 | 339 | <span class="n">_validate_data_source</span><span class="p">(</span><span class="n">data_source</span><span class="p">)</span> |
340 | | - <span class="k">if</span> <span class="n">feature_source</span><span class="p">:</span> |
| 340 | + <span class="k">if</span> <span class="n">feature_source</span> <span class="ow">is</span> <span class="ow">not</span> <span class="kc">None</span><span class="p">:</span> |
341 | 341 | <span class="n">_validate_data_source</span><span class="p">(</span><span class="n">feature_source</span><span class="p">)</span> |
342 | 342 | <span class="k">if</span> <span class="n">navigation_mode</span><span class="p">:</span> |
343 | 343 | <span class="n">navigation_mode</span> <span class="o">=</span> <span class="n">_validate_navigation_mode</span><span class="p">(</span><span class="n">navigation_mode</span><span class="p">)</span> |
@@ -545,12 +545,13 @@ <h1>Source code for dataretrieval.nldi</h1><div class="highlight"><pre> |
545 | 545 | <span class="n">url</span><span class="p">,</span> <span class="p">{},</span> <span class="s2">"Error getting available data sources"</span> |
546 | 546 | <span class="p">)</span> |
547 | 547 | <span class="n">_AVAILABLE_DATA_SOURCES</span> <span class="o">=</span> <span class="p">[</span><span class="n">ds</span><span class="p">[</span><span class="s2">"source"</span><span class="p">]</span> <span class="k">for</span> <span class="n">ds</span> <span class="ow">in</span> <span class="n">available_data_sources</span><span class="p">]</span> |
548 | | - <span class="k">if</span> <span class="n">data_source</span> <span class="ow">not</span> <span class="ow">in</span> <span class="n">_AVAILABLE_DATA_SOURCES</span><span class="p">:</span> |
549 | | - <span class="n">err_msg</span> <span class="o">=</span> <span class="p">(</span> |
550 | | - <span class="sa">f</span><span class="s2">"Invalid data source '</span><span class="si">{</span><span class="n">data_source</span><span class="si">}</span><span class="s2">'."</span> |
551 | | - <span class="sa">f</span><span class="s2">" Available data sources are: </span><span class="si">{</span><span class="n">_AVAILABLE_DATA_SOURCES</span><span class="si">}</span><span class="s2">"</span> |
552 | | - <span class="p">)</span> |
553 | | - <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="n">err_msg</span><span class="p">)</span> |
| 548 | + |
| 549 | + <span class="k">if</span> <span class="n">data_source</span> <span class="ow">not</span> <span class="ow">in</span> <span class="n">_AVAILABLE_DATA_SOURCES</span><span class="p">:</span> |
| 550 | + <span class="n">err_msg</span> <span class="o">=</span> <span class="p">(</span> |
| 551 | + <span class="sa">f</span><span class="s2">"Invalid data source '</span><span class="si">{</span><span class="n">data_source</span><span class="si">}</span><span class="s2">'."</span> |
| 552 | + <span class="sa">f</span><span class="s2">" Available data sources are: </span><span class="si">{</span><span class="n">_AVAILABLE_DATA_SOURCES</span><span class="si">}</span><span class="s2">"</span> |
| 553 | + <span class="p">)</span> |
| 554 | + <span class="k">raise</span> <span class="ne">ValueError</span><span class="p">(</span><span class="n">err_msg</span><span class="p">)</span> |
554 | 555 |
|
555 | 556 |
|
556 | 557 | <span class="k">def</span><span class="w"> </span><span class="nf">_features_err_msg</span><span class="p">(</span><span class="n">feature_source</span><span class="p">,</span> <span class="n">feature_id</span><span class="p">,</span> <span class="n">comid</span><span class="p">,</span> <span class="n">data_source</span><span class="p">)</span> <span class="o">-></span> <span class="nb">str</span><span class="p">:</span> |
|
0 commit comments