diff options
| author | Andreas Jaeger <aj@suse.com> | 2020-03-31 16:20:19 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.com> | 2020-03-31 17:39:51 +0200 |
| commit | 1a6a003242f02829445a3e48b199d990c21ac510 (patch) | |
| tree | 59f5db34d691937c01c58bfd29e7d080dc9e891b /ceilometer/polling | |
| parent | 56012eaa5cd64fd61b223942aeb7a2320cd131da (diff) | |
| download | ceilometer-1a6a003242f02829445a3e48b199d990c21ac510.tar.gz | |
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.
Change-Id: I129bc38e6663836e12610dd50a20c74dbc79891c
Diffstat (limited to 'ceilometer/polling')
| -rw-r--r-- | ceilometer/polling/dynamic_pollster.py | 6 | ||||
| -rw-r--r-- | ceilometer/polling/manager.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ceilometer/polling/dynamic_pollster.py b/ceilometer/polling/dynamic_pollster.py index 913e30cd..cd2c0d19 100644 --- a/ceilometer/polling/dynamic_pollster.py +++ b/ceilometer/polling/dynamic_pollster.py @@ -345,7 +345,7 @@ class PollsterDefinition(object): class PollsterDefinitions(object): - POLLSTER_VALID_NAMES_REGEXP = "^([\w-]+)(\.[\w-]+)*(\.{[\w-]+})?$" + POLLSTER_VALID_NAMES_REGEXP = r"^([\w-]+)(\.[\w-]+)*(\.{[\w-]+})?$" standard_definitions = [ PollsterDefinition(name='name', required=True, @@ -416,10 +416,10 @@ class PollsterDefinitions(object): class MultiMetricPollsterDefinitions(PollsterDefinitions): - MULTI_METRIC_POLLSTER_NAME_REGEXP = ".*(\.{(\w+)})$" + MULTI_METRIC_POLLSTER_NAME_REGEXP = r".*(\.{(\w+)})$" pattern_pollster_name = re.compile( MULTI_METRIC_POLLSTER_NAME_REGEXP) - MULTI_METRIC_POLLSTER_VALUE_ATTRIBUTE_REGEXP = "^(\[(\w+)\])((\.\w+)+)$" + MULTI_METRIC_POLLSTER_VALUE_ATTRIBUTE_REGEXP = r"^(\[(\w+)\])((\.\w+)+)$" pattern_pollster_value_attribute = re.compile( MULTI_METRIC_POLLSTER_VALUE_ATTRIBUTE_REGEXP) diff --git a/ceilometer/polling/manager.py b/ceilometer/polling/manager.py index fbdce8b5..c02cdd50 100644 --- a/ceilometer/polling/manager.py +++ b/ceilometer/polling/manager.py @@ -132,7 +132,7 @@ class PollingTask(object): # we relate the static resources and per-source discovery to # each combination of pollster and matching source - resource_factory = lambda: Resources(agent_manager) + resource_factory = lambda: Resources(agent_manager) # noqa: E731 self.resources = collections.defaultdict(resource_factory) self._batch_size = self.manager.conf.polling.batch_size |