From f90dbb9321e0b34ebd1f2da54c60c8738005e539 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Wed, 6 Feb 2013 17:22:11 -0600 Subject: [PATCH] fixed custom_import indentation --- VERSION | 2 +- gluon/custom_import.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/VERSION b/VERSION index 5d6f6bbe..3642bea8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.1-alpha.2+timestamp.2013.02.06.11.34.01 +Version 2.4.1-alpha.2+timestamp.2013.02.06.17.21.25 diff --git a/gluon/custom_import.py b/gluon/custom_import.py index 0d62c37f..b1c67e0c 100644 --- a/gluon/custom_import.py +++ b/gluon/custom_import.py @@ -81,10 +81,10 @@ def custom_importer(name, globals=None, locals=None, fromlist=None, level=-1): raise ImportError, 'Cannot import module %s' % str(e) modules_prefix += "." + itemname return result - else: - # import like "from x import a, b, ..." - pname = modules_prefix + "." + name - return base_importer(pname, globals, locals, fromlist, level) + else: + # import like "from x import a, b, ..." + pname = modules_prefix + "." + name + return base_importer(pname, globals, locals, fromlist, level) except ImportError, e1: import_tb = sys.exc_info()[2] try: