From 67b4e94be6124798867c2f072dca8748dcd6da37 Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Thu, 22 Aug 2013 11:34:47 +1000 Subject: [PATCH] Fix crash in "make html" introduced by the global env Change-Id: Iece0e122841829d3561b71575065ffa7b656b504 --- heat/doc/resources.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/heat/doc/resources.py b/heat/doc/resources.py index cb799b11..3cafc105 100644 --- a/heat/doc/resources.py +++ b/heat/doc/resources.py @@ -15,7 +15,6 @@ # -*- coding: utf-8 -*- from heat.engine import resources -from heat.engine import resource from heat.openstack.common.gettextutils import _ from docutils import nodes @@ -254,9 +253,10 @@ Resources: def _all_resources(prefix=None): - all_resources = resource._resource_classes - for resource_type in sorted(all_resources.keys()): - resource_class = all_resources[resource_type] + g_env = resources.global_env() + all_resources = g_env.get_types() + for resource_type in sorted(all_resources): + resource_class = g_env.get_class(resource_type) if not prefix or resource_type.startswith(prefix): yield resource_type, resource_class @@ -267,4 +267,3 @@ def setup(app): app.add_node(resourcepages) app.add_directive('resourcepages', ResourcePages) - -- 2.45.2