Skip to content

Commit 5fbc09e

Browse files
authored
lint relative imports (DataDog#20646)
* Remove relative imports for non parent modules * changelog
1 parent 2df1b1d commit 5fbc09e

162 files changed

Lines changed: 590 additions & 410 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove relative imports for non parent modules

datadog_checks_base/datadog_checks/base/checks/base.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,32 +29,32 @@
2929
import lazy_loader
3030

3131
from datadog_checks.base.agent import AGENT_RUNNING, aggregator, datadog_agent
32+
from datadog_checks.base.config import is_affirmative
33+
from datadog_checks.base.constants import ServiceCheck
34+
from datadog_checks.base.errors import ConfigurationError
35+
from datadog_checks.base.types import (
36+
AgentConfigType,
37+
Event,
38+
ExternalTagType,
39+
InitConfigType,
40+
InstanceType,
41+
ProxySettings,
42+
ServiceCheckStatus,
43+
)
44+
from datadog_checks.base.utils.agent.utils import should_profile_memory
45+
from datadog_checks.base.utils.common import ensure_bytes, to_native_string
46+
from datadog_checks.base.utils.fips import enable_fips
3247
from datadog_checks.base.utils.format import json
48+
from datadog_checks.base.utils.tagging import GENERIC_TAGS
49+
from datadog_checks.base.utils.tracing import traced_class
3350

34-
from ..config import is_affirmative
35-
from ..constants import ServiceCheck
36-
from ..errors import ConfigurationError
37-
from ..types import (
38-
AgentConfigType, # noqa: F401
39-
Event, # noqa: F401
40-
ExternalTagType, # noqa: F401
41-
InitConfigType, # noqa: F401
42-
InstanceType, # noqa: F401
43-
ProxySettings, # noqa: F401
44-
ServiceCheckStatus, # noqa: F401
45-
)
46-
from ..utils.agent.utils import should_profile_memory
47-
from ..utils.common import ensure_bytes, to_native_string
48-
from ..utils.fips import enable_fips
49-
from ..utils.tagging import GENERIC_TAGS
50-
from ..utils.tracing import traced_class
5151
from ._config_ast import parse as _parse_ast_config
5252

5353
if AGENT_RUNNING:
54-
from ..log import CheckLoggingAdapter, init_logging
54+
from datadog_checks.base.log import CheckLoggingAdapter, init_logging
5555

5656
else:
57-
from ..stubs.log import CheckLoggingAdapter, init_logging
57+
from datadog_checks.base.stubs.log import CheckLoggingAdapter, init_logging
5858

5959
init_logging()
6060

@@ -1287,7 +1287,7 @@ def run(self):
12871287
self._clear_diagnosis()
12881288
# Ignore check initializations if running in a separate process
12891289
if is_affirmative(self.instance.get('process_isolation', self.init_config.get('process_isolation', False))):
1290-
from ..utils.replay.execute import run_with_isolation
1290+
from datadog_checks.base.utils.replay.execute import run_with_isolation
12911291

12921292
run_with_isolation(self, aggregator, datadog_agent)
12931293
else:
@@ -1302,7 +1302,7 @@ def run(self):
13021302
instance = copy.deepcopy(self.instances[0])
13031303

13041304
if 'set_breakpoint' in self.init_config:
1305-
from ..utils.agent.debug import enter_pdb
1305+
from datadog_checks.base.utils.agent.debug import enter_pdb
13061306

13071307
enter_pdb(self.check, line=self.init_config['set_breakpoint'], args=(instance,))
13081308
elif self.should_profile_memory():
@@ -1457,7 +1457,7 @@ def should_profile_memory(self):
14571457

14581458
def profile_memory(self, func, namespaces=None, args=(), kwargs=None, extra_tags=None):
14591459
# type: (Callable[..., Any], Optional[Sequence[str]], Sequence[Any], Optional[Dict[str, Any]], Optional[List[str]]) -> None # noqa: E501
1460-
from ..utils.agent.memory import profile_memory
1460+
from datadog_checks.base.utils.agent.memory import profile_memory
14611461

14621462
if namespaces is None:
14631463
namespaces = self.check_id.split(':', 1)

datadog_checks_base/datadog_checks/base/checks/kube_leader/base_check.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# (C) Datadog, Inc. 2018-present
22
# All rights reserved
33
# Licensed under a 3-clause BSD style license (see LICENSE)
4-
from .. import AgentCheck
4+
from datadog_checks.base.checks import AgentCheck
5+
56
from .mixins import KubeLeaderElectionMixin
67

78

datadog_checks_base/datadog_checks/base/checks/kube_leader/mixins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# All rights reserved
33
# Licensed under a 3-clause BSD style license (see LICENSE)
44
from datadog_checks.base.agent import datadog_agent
5+
from datadog_checks.base.checks import AgentCheck
56

6-
from .. import AgentCheck
77
from .record import ElectionRecordAnnotation, ElectionRecordLease
88

99
# Import lazily to reduce memory footprint

datadog_checks_base/datadog_checks/base/checks/kubelet_base/base.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import json
55
from datetime import datetime, timedelta, timezone
66

7-
from ...utils.date import parse_rfc3339
8-
from .. import AgentCheck
7+
from datadog_checks.base.checks import AgentCheck
8+
from datadog_checks.base.utils.date import parse_rfc3339
99

1010
try:
1111
from datadog_agent import get_config

datadog_checks_base/datadog_checks/base/checks/openmetrics/base_check.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55

66
import requests
77

8-
from ...errors import CheckException
9-
from ...utils.tracing import traced_class
10-
from .. import AgentCheck
8+
from datadog_checks.base.checks import AgentCheck
9+
from datadog_checks.base.errors import CheckException
10+
from datadog_checks.base.utils.tracing import traced_class
11+
1112
from .mixins import OpenMetricsScraperMixin
1213

1314
STANDARD_FIELDS = [

datadog_checks_base/datadog_checks/base/checks/openmetrics/mixins.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
from prometheus_client.samples import Sample
1515

1616
from datadog_checks.base.agent import datadog_agent
17-
18-
from ...config import is_affirmative
19-
from ...errors import CheckException
20-
from ...utils.common import to_native_string
21-
from ...utils.http import RequestsWrapper
22-
from .. import AgentCheck
23-
from ..libs.prometheus import text_fd_to_metric_families
17+
from datadog_checks.base.checks import AgentCheck
18+
from datadog_checks.base.checks.libs.prometheus import text_fd_to_metric_families
19+
from datadog_checks.base.config import is_affirmative
20+
from datadog_checks.base.errors import CheckException
21+
from datadog_checks.base.utils.common import to_native_string
22+
from datadog_checks.base.utils.http import RequestsWrapper
2423

2524

2625
class OpenMetricsScraperMixin(object):

datadog_checks_base/datadog_checks/base/checks/openmetrics/v2/base.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66

77
from requests.exceptions import RequestException
88

9-
from ....errors import ConfigurationError
10-
from ....utils.tracing import traced_class
11-
from ... import AgentCheck
9+
from datadog_checks.base.checks import AgentCheck
10+
from datadog_checks.base.errors import ConfigurationError
11+
from datadog_checks.base.utils.tracing import traced_class
12+
1213
from .scraper import OpenMetricsScraper
1314

1415

datadog_checks_base/datadog_checks/base/checks/openmetrics/v2/labels.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Licensed under a 3-clause BSD style license (see LICENSE)
44
from collections import ChainMap
55

6-
from ....utils.functions import no_op
6+
from datadog_checks.base.utils.functions import no_op
77

88

99
class LabelAggregator:

datadog_checks_base/datadog_checks/base/checks/openmetrics/v2/transform.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
import re
55
from copy import deepcopy
66

7-
from ....config import is_affirmative
7+
from datadog_checks.base.config import is_affirmative
8+
89
from . import transformers
910

1011
DEFAULT_METRIC_TYPE = 'native'

0 commit comments

Comments
 (0)