Fix imports in __init__.py files to explicitly re-export symbols

datadog/__init__.py

@@ -18,11 +18,15 @@
 
 # datadog
 from datadog import api
-from datadog.dogstatsd import DogStatsd, statsd  # noqa
-from datadog.threadstats import ThreadStats, datadog_lambda_wrapper, lambda_metric  # noqa
+from datadog.dogstatsd import DogStatsd as DogStatsd, statsd as statsd  # noqa
+from datadog.threadstats import (  # noqa
+    ThreadStats as ThreadStats,
+    datadog_lambda_wrapper as datadog_lambda_wrapper,
+    lambda_metric as lambda_metric,
+)
 from datadog.util.compat import iteritems, NullHandler, text
 from datadog.util.hostname import get_hostname
-from datadog.version import __version__  # noqa
+from datadog.version import __version__ as __version__  # noqa
 
 # Loggers
 logging.getLogger("datadog.api").addHandler(NullHandler())

datadog/api/__init__.py

@@ -24,29 +24,31 @@
 _return_raw_response = False
 
 # Resources
-from datadog.api.comments import Comment
-from datadog.api.dashboard_lists import DashboardList
-from datadog.api.distributions import Distribution
-from datadog.api.downtimes import Downtime
-from datadog.api.timeboards import Timeboard
-from datadog.api.dashboards import Dashboard
-from datadog.api.events import Event
-from datadog.api.infrastructure import Infrastructure
-from datadog.api.metadata import Metadata
-from datadog.api.metrics import Metric
-from datadog.api.monitors import Monitor
-from datadog.api.screenboards import Screenboard
-from datadog.api.graphs import Graph, Embed
-from datadog.api.hosts import Host, Hosts
-from datadog.api.service_checks import ServiceCheck
-from datadog.api.tags import Tag
-from datadog.api.users import User
-from datadog.api.aws_integration import AwsIntegration
-from datadog.api.aws_log_integration import AwsLogsIntegration
-from datadog.api.azure_integration import AzureIntegration
-from datadog.api.gcp_integration import GcpIntegration
-from datadog.api.roles import Roles
-from datadog.api.permissions import Permissions
-from datadog.api.service_level_objectives import ServiceLevelObjective
-from datadog.api.synthetics import Synthetics
-from datadog.api.logs import Logs
+from datadog.api.comments import Comment as Comment
+from datadog.api.dashboard_lists import DashboardList as DashboardList
+from datadog.api.distributions import Distribution as Distribution
+from datadog.api.downtimes import Downtime as Downtime
+from datadog.api.timeboards import Timeboard as Timeboard
+from datadog.api.dashboards import Dashboard as Dashboard
+from datadog.api.events import Event as Event
+from datadog.api.infrastructure import Infrastructure as Infrastructure
+from datadog.api.metadata import Metadata as Metadata
+from datadog.api.metrics import Metric as Metric
+from datadog.api.monitors import Monitor as Monitor
+from datadog.api.screenboards import Screenboard as Screenboard
+from datadog.api.graphs import Graph as Graph, Embed as Embed
+from datadog.api.hosts import Host as Host, Hosts as Hosts
+from datadog.api.service_checks import ServiceCheck as ServiceCheck
+from datadog.api.tags import Tag as Tag
+from datadog.api.users import User as User
+from datadog.api.aws_integration import AwsIntegration as AwsIntegration
+from datadog.api.aws_log_integration import AwsLogsIntegration as AwsLogsIntegration
+from datadog.api.azure_integration import AzureIntegration as AzureIntegration
+from datadog.api.gcp_integration import GcpIntegration as GcpIntegration
+from datadog.api.roles import Roles as Roles
+from datadog.api.permissions import Permissions as Permissions
+from datadog.api.service_level_objectives import (
+    ServiceLevelObjective as ServiceLevelObjective,
+)
+from datadog.api.synthetics import Synthetics as Synthetics
+from datadog.api.logs import Logs as Logs

datadog/dogstatsd/__init__.py

@@ -1,4 +1,4 @@
 # Unless explicitly stated otherwise all files in this repository are licensed under the BSD-3-Clause License.
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2015-Present Datadog, Inc
-from datadog.dogstatsd.base import DogStatsd, statsd  # noqa
+from datadog.dogstatsd.base import DogStatsd as DogStatsd, statsd as statsd  # noqa

datadog/threadstats/__init__.py

@@ -1,5 +1,8 @@
 # Unless explicitly stated otherwise all files in this repository are licensed under the BSD-3-Clause License.
 # This product includes software developed at Datadog (https://www.datadoghq.com/).
 # Copyright 2015-Present Datadog, Inc
-from datadog.threadstats.base import ThreadStats  # noqa
-from datadog.threadstats.aws_lambda import lambda_metric, datadog_lambda_wrapper  # noqa
+from datadog.threadstats.base import ThreadStats as ThreadStats  # noqa
+from datadog.threadstats.aws_lambda import (  # noqa
+    lambda_metric as lambda_metric,
+    datadog_lambda_wrapper as datadog_lambda_wrapper,
+)