Commit b62dc60c authored by Tomasz Kontusz's avatar Tomasz Kontusz Committed by Tim Graham
Browse files

[1.8.x] Fixed ImportError message in utils.module_loading.import_string() 

Backport of c2b4967e from master
parent 66496c84

django/utils/module_loading.py

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ def import_string(dotted_path): 
        return getattr(module, class_name)

    except AttributeError:

        msg = 'Module "%s" does not define a "%s" attribute/class' % (

            dotted_path, class_name)

            module_path, class_name)

        six.reraise(ImportError, ImportError(msg), sys.exc_info()[2])

tests/utils_tests/test_module_loading.py

+3 −1
Original line number Diff line number Diff line
@@ -150,8 +150,10 @@ class ModuleImportTestCase(unittest.TestCase): 


        # Test exceptions raised

        self.assertRaises(ImportError, import_string, 'no_dots_in_path')

        self.assertRaises(ImportError, import_string, 'utils_tests.unexistent')

        self.assertRaises(ImportError, import_string, 'unexistent.path')

        msg = 'Module "utils_tests" does not define a "unexistent" attribute'

        with six.assertRaisesRegex(self, ImportError, msg):

            import_string('utils_tests.unexistent')





@modify_settings(INSTALLED_APPS={'append': 'utils_tests.test_module'})