Skip to content

Commit 7640ef0

Browse files
committed
dev
1 parent 99e77b1 commit 7640ef0

File tree

3 files changed

+18
-8
lines changed

3 files changed

+18
-8
lines changed

cf/cellmethod.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import logging
2-
import re
32
from ast import literal_eval as ast_literal_eval
43

54
import cfdm
@@ -89,6 +88,8 @@ def create(cls, cell_methods_string=None):
8988
>>> c = CellMethod.create('lat: mean (interval: 1 hour)')
9089
9190
"""
91+
import re
92+
9293
incorrect_interval = "Cell method interval is incorrectly formatted"
9394

9495
out = []

cf/data/collapse/collapse_active.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
from functools import wraps
33
from numbers import Integral
44

5+
from cfdm import is_log_level_info
6+
57
from cf.functions import (
68
active_storage,
79
active_storage_max_requests,
810
active_storage_url,
9-
is_log_level_info,
1011
)
1112

1213
logger = logging.getLogger(__name__)

cf/functions.py

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
import atexit
2-
import csv
3-
import logging
42
import os
53
import platform
6-
import re
74
import warnings
85
from collections.abc import Iterable
96
from functools import partial
107
from importlib.util import find_spec
118
from itertools import product
12-
from math import isnan
139
from os import mkdir
1410
from os.path import abspath as _os_path_abspath
1511
from os.path import expanduser as _os_path_expanduser
@@ -1494,6 +1490,9 @@ def total_memory():
14941490
def is_log_level_info(logger):
14951491
"""Return True if and only if log level is at least as verbose as INFO.
14961492
1493+
Deprecated at version NEXTVERSION and is no longer available. Use
1494+
`cfdm.is_log_level_info` instead.
1495+
14971496
.. versionadded:: 3.16.3
14981497
14991498
.. seealso:: `log_level`
@@ -1509,7 +1508,12 @@ def is_log_level_info(logger):
15091508
Whether or not the log level is at least INFO.
15101509
15111510
"""
1512-
return logger.parent.level <= logging.INFO
1511+
_DEPRECATION_ERROR_FUNCTION(
1512+
"is_log_level_info",
1513+
message="Use cfdm.is_log_level_info instead",
1514+
version="NEXTVERSION",
1515+
removed_at="5.0.0",
1516+
) # pragma: no cover
15131517

15141518

15151519
# --------------------------------------------------------------------
@@ -2076,6 +2080,8 @@ def indices_shape(indices, full_shape, keepdims=True):
20762080
[]
20772081
20782082
"""
2083+
from math import isnan
2084+
20792085
from dask.base import is_dask_collection
20802086

20812087
shape = []
@@ -2498,6 +2504,9 @@ def load_stash2standard_name(table=None, delimiter="!", merge=True):
24982504
>>> cf.load_stash2standard_name('my_table4.txt', merge=False)
24992505
25002506
"""
2507+
import csv
2508+
import re
2509+
25012510
# 0 Model
25022511
# 1 STASH code
25032512
# 2 STASH name
@@ -2507,7 +2516,6 @@ def load_stash2standard_name(table=None, delimiter="!", merge=True):
25072516
# 6 standard_name
25082517
# 7 CF extra info
25092518
# 8 PP extra info
2510-
25112519
# Number matching regular expression
25122520
number_regex = r"([-+]?\d*\.?\d+(e[-+]?\d+)?)"
25132521

0 commit comments

Comments
 (0)