Update hacking for Python3
The repo is Python 3 now, so update hacking to version 3.0 which supports Python 3. Fix problems found. Update local hacking checks for new flake8. Remove hacking and friends from lower-constraints, they are not needed to be installed at run-time. Change-Id: Ia6af344ec8441dc98a0820176373dcff3a8c80d5
This commit is contained in:
@@ -112,10 +112,10 @@ class DataSourceManager(object):
|
||||
datasource is attempted.
|
||||
"""
|
||||
|
||||
if not self.datasources or len(self.datasources) is 0:
|
||||
if not self.datasources or len(self.datasources) == 0:
|
||||
raise exception.NoDatasourceAvailable
|
||||
|
||||
if not metrics or len(metrics) is 0:
|
||||
if not metrics or len(metrics) == 0:
|
||||
LOG.critical("Can not retrieve datasource without specifying "
|
||||
"list of required metrics.")
|
||||
raise exception.InvalidParameter(parameter='metrics',
|
||||
@@ -125,11 +125,11 @@ class DataSourceManager(object):
|
||||
no_metric = False
|
||||
for metric in metrics:
|
||||
if (metric not in self.metric_map[datasource] or
|
||||
self.metric_map[datasource].get(metric) is None):
|
||||
no_metric = True
|
||||
LOG.warning("Datasource: {0} could not be used due to "
|
||||
"metric: {1}".format(datasource, metric))
|
||||
break
|
||||
self.metric_map[datasource].get(metric) is None):
|
||||
no_metric = True
|
||||
LOG.warning("Datasource: {0} could not be used due to "
|
||||
"metric: {1}".format(datasource, metric))
|
||||
break
|
||||
if not no_metric:
|
||||
# Try to use a specific datasource but attempt additional
|
||||
# datasources upon exceptions (if config has more datasources)
|
||||
|
||||
Reference in New Issue
Block a user