diff options
author | Takashi Kajinami <tkajinam@redhat.com> | 2021-07-06 21:17:38 +0900 |
---|---|---|
committer | Takashi Kajinami <tkajinam@redhat.com> | 2021-07-06 21:23:44 +0900 |
commit | 482e1e974f6773160cc5ab62dd5c6143d0c40568 (patch) | |
tree | 7e9d270720b7002354ffe8f0bef9858654f07532 /ceilometer | |
parent | 14922b71d2eebcf939963d010904525b01b2897e (diff) | |
download | ceilometer-482e1e974f6773160cc5ab62dd5c6143d0c40568.tar.gz |
Replace oslo_utils.fnmatch with fnmatch
The oslo_utils.fnmatch module was added to solve an issue in py2.7 but
it is no longer required because py2.7 is no longer supported.
The module was deprecated since oslo.utils 4.9.1[1] and the stdlib's
fnmatch module should be used instead.
[1] 4c893c92f551c9dd2a7cfbe7ae8171ad8139df0b
Change-Id: Ibae52796df829f151c3088026a326deaf859bd44
Diffstat (limited to 'ceilometer')
-rw-r--r-- | ceilometer/agent.py | 2 | ||||
-rw-r--r-- | ceilometer/event/converter.py | 3 | ||||
-rw-r--r-- | ceilometer/publisher/gnocchi.py | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/ceilometer/agent.py b/ceilometer/agent.py index 32423ed3..48e42b97 100644 --- a/ceilometer/agent.py +++ b/ceilometer/agent.py @@ -13,11 +13,11 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +import fnmatch import os import pkg_resources from oslo_log import log -from oslo_utils import fnmatch import yaml LOG = log.getLogger(__name__) diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py index c018f651..c33a90e6 100644 --- a/ceilometer/event/converter.py +++ b/ceilometer/event/converter.py @@ -13,9 +13,10 @@ # License for the specific language governing permissions and limitations # under the License. +import fnmatch + from oslo_config import cfg from oslo_log import log -from oslo_utils import fnmatch from oslo_utils import timeutils import pkg_resources diff --git a/ceilometer/publisher/gnocchi.py b/ceilometer/publisher/gnocchi.py index 9ff42046..19d7d54b 100644 --- a/ceilometer/publisher/gnocchi.py +++ b/ceilometer/publisher/gnocchi.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. from collections import defaultdict +import fnmatch import hashlib import itertools import json @@ -24,7 +25,6 @@ import uuid from gnocchiclient import exceptions as gnocchi_exc from keystoneauth1 import exceptions as ka_exceptions from oslo_log import log -from oslo_utils import fnmatch from oslo_utils import timeutils from stevedore import extension from urllib import parse as urlparse |