Merge remote-tracking branch 'upstream/master' into django_2_compat

This commit is contained in:
Ronald van Zon
2017-12-12 15:01:44 +01:00

View File

@@ -216,10 +216,10 @@ if Conf.ERROR_REPORTER:
# iterate through the configured error reporters,
# and instantiate an ErrorReporter using the provided config
for name, conf in error_conf.items():
Reporter = pkg_resources.iter_entry_points(
'djangoq.errorreporters', name).load()
e = Reporter(**conf)
reporters.append(e)
for entry in pkg_resources.iter_entry_points(
'djangoq.errorreporters', name):
Reporter = entry.load()
reporters.append(Reporter(**conf))
error_reporter = ErrorReporter(reporters)
except ImportError:
error_reporter = None