openstack
/
horizon
Code Issues Proposed changes

Corrects the ImportError handling for the override mechanism. 

Fixes bug 973836.

Change-Id: Ide849ca230d1e07c7242268d32f06600e09c6746
This commit is contained in:
Gabriel Hurley 2012-04-04 16:16:53 -07:00 committed by Chuck Short
parent a0b7c04978
commit 77371f33db
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
horizon/base.py
View File

@ -743,12 +743,13 @@ class Site(Registry, HorizonComponent):
bits = customization_module.split('.')
mod_name = bits.pop()
package = '.'.join(bits)
mod = import_module(package)
try:
before_import_registry = copy.copy(self._registry)
import_module('%s.%s' % (package, mod_name))
except:
self._registry = before_import_registry
if module_has_submodule(package, mod_name):
if module_has_submodule(mod, mod_name):
raise
# Compile the dynamic urlconf.