refactor to use yaml.FullLoader explicitly

see https://github.com/yaml/pyyaml/wiki/PyYAML-yaml.load(input)-Deprecation for details
iiasa · Jul 24, 2019 · f7bc8c1 · f7bc8c1
1 parent 02bf713
commit f7bc8c1
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 21 deletions.
diff --git a/assessment/spm_sr15_figure_3a_global_emissions_pathways.ipynb b/assessment/spm_sr15_figure_3a_global_emissions_pathways.ipynb
@@ -87,7 +87,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/spm_sr15_figure_3b_illustrative_pathways.ipynb b/assessment/spm_sr15_figure_3b_illustrative_pathways.ipynb
@@ -81,7 +81,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/spm_sr15_statements.ipynb b/assessment/spm_sr15_statements.ipynb
@@ -80,7 +80,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "cats = specs.pop('cats')\n",
     "cats_15 = specs.pop('cats_15')\n",

diff --git a/assessment/sr15_2.3.1_range_of_assumptions.ipynb b/assessment/sr15_2.3.1_range_of_assumptions.ipynb
@@ -80,7 +80,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.3.3_global_emissions_characteristics.ipynb b/assessment/sr15_2.3.3_global_emissions_characteristics.ipynb
@@ -82,7 +82,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.3.3_global_emissions_statistics.ipynb b/assessment/sr15_2.3.3_global_emissions_statistics.ipynb
@@ -77,7 +77,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.3.3_short-lived_climate_forcers.ipynb b/assessment/sr15_2.3.3_short-lived_climate_forcers.ipynb
@@ -82,7 +82,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.3.3_short-lived_climate_forcers_radiative_forcing.ipynb b/assessment/sr15_2.3.3_short-lived_climate_forcers_radiative_forcing.ipynb
@@ -82,7 +82,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.3.4_carbon_dioxide_removal.ipynb b/assessment/sr15_2.3.4_carbon_dioxide_removal.ipynb
@@ -79,7 +79,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.4.1_final_energy.ipynb b/assessment/sr15_2.4.1_final_energy.ipynb
@@ -82,7 +82,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.4.2.1_primary_energy_marker-scenarios.ipynb b/assessment/sr15_2.4.2.1_primary_energy_marker-scenarios.ipynb
@@ -81,7 +81,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.4.2.1_primary_energy_statistics.ipynb b/assessment/sr15_2.4.2.1_primary_energy_statistics.ipynb
@@ -80,7 +80,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.4.2.2_electricity_generation_marker-scenarios.ipynb b/assessment/sr15_2.4.2.2_electricity_generation_marker-scenarios.ipynb
@@ -81,7 +81,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.4.2.2_electricity_generation_statistics.ipynb b/assessment/sr15_2.4.2.2_electricity_generation_statistics.ipynb
@@ -80,7 +80,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.4.2.3_ccs_deployment.ipynb b/assessment/sr15_2.4.2.3_ccs_deployment.ipynb
@@ -82,7 +82,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.4.4_afolu_emissions.ipynb b/assessment/sr15_2.4.4_afolu_emissions.ipynb
@@ -82,7 +82,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_2.5_carbon_price_analysis.ipynb b/assessment/sr15_2.5_carbon_price_analysis.ipynb
@@ -80,7 +80,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/assessment/sr15_4.2_sectoral_indicators.ipynb b/assessment/sr15_4.2_sectoral_indicators.ipynb
@@ -79,7 +79,7 @@
    "outputs": [],
    "source": [
     "with open(\"sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/further_analysis/iamc15_energy_intensity.ipynb b/further_analysis/iamc15_energy_intensity.ipynb
@@ -80,7 +80,7 @@
    "outputs": [],
    "source": [
     "with open(\"../assessment/sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/further_analysis/iamc15_gdp_per_capita.ipynb b/further_analysis/iamc15_gdp_per_capita.ipynb
@@ -80,7 +80,7 @@
    "outputs": [],
    "source": [
     "with open(\"../assessment/sr15_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",

diff --git a/ncc/ncc_figure.ipynb b/ncc/ncc_figure.ipynb
@@ -87,7 +87,7 @@
    "outputs": [],
    "source": [
     "with open(\"../analysis/sr1p5_specs.yaml\", 'r') as stream:\n",
-    "    specs = yaml.load(stream)\n",
+    "    specs = yaml.load(stream, Loader=yaml.FullLoader)\n",
     "\n",
     "rc = pyam.run_control()\n",
     "for item in specs.pop('run_control').items():\n",