From 1b4f105bcc4f37644e896a8e090382ce049dac91 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Sat, 9 Jun 2012 12:33:20 -0700 Subject: Add copyright + index hash directly instead of get. --- cloudinit/importer.py | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'cloudinit') diff --git a/cloudinit/importer.py b/cloudinit/importer.py index deea0956..0344d0de 100644 --- a/cloudinit/importer.py +++ b/cloudinit/importer.py @@ -1,4 +1,24 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 +# vi: ts=4 expandtab +# +# Copyright (C) 2012 Canonical Ltd. +# Copyright (C) 2012 Hewlett-Packard Development Company, L.P. +# Copyright (C) 2012 Yahoo! Inc. +# +# Author: Scott Moser +# Author: Juerg Haefliger +# Author: Joshua Harlow +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 3, as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . import sys @@ -6,6 +26,6 @@ import sys def import_module(module_name): try: __import__(module_name) - return sys.modules.get(module_name, None) + return sys.modules[module_name] except ImportError as err: raise RuntimeError('Could not load module %s: %s' % (module_name, err)) -- cgit v1.2.3