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