From 48484d59b06e8892e884a2d66d293d72b052718c Mon Sep 17 00:00:00 2001
From: Xiang Yan <xiangyan@microsoft.com>
Date: Thu, 24 Jun 2021 10:18:36 -0700
Subject: [PATCH 1/2] move _utils.py

---
 sdk/core/azure-core/azure/core/messaging.py                | 2 +-
 sdk/core/azure-core/azure/core/pipeline/policies/_utils.py | 2 +-
 sdk/core/azure-core/azure/core/pipeline/transport/_base.py | 2 +-
 sdk/core/azure-core/azure/core/{ => utils}/_utils.py       | 0
 sdk/core/azure-core/tests/test_messaging_cloud_event.py    | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename sdk/core/azure-core/azure/core/{ => utils}/_utils.py (100%)

diff --git a/sdk/core/azure-core/azure/core/messaging.py b/sdk/core/azure-core/azure/core/messaging.py
index 9131a7b46d69..d2027dcf4688 100644
--- a/sdk/core/azure-core/azure/core/messaging.py
+++ b/sdk/core/azure-core/azure/core/messaging.py
@@ -7,7 +7,7 @@
 import uuid
 from base64 import b64decode
 from datetime import datetime
-from azure.core._utils import _convert_to_isoformat, TZ_UTC
+from .utils._utils import _convert_to_isoformat, TZ_UTC
 from azure.core.serialization import NULL
 
 try:
diff --git a/sdk/core/azure-core/azure/core/pipeline/policies/_utils.py b/sdk/core/azure-core/azure/core/pipeline/policies/_utils.py
index 76ee690c1d8f..326b2099bc11 100644
--- a/sdk/core/azure-core/azure/core/pipeline/policies/_utils.py
+++ b/sdk/core/azure-core/azure/core/pipeline/policies/_utils.py
@@ -26,7 +26,7 @@
 import datetime
 import email.utils
 from requests.structures import CaseInsensitiveDict
-from ..._utils import _FixedOffset
+from ...utils._utils import _FixedOffset
 
 def _parse_http_date(text):
     """Parse a HTTP date format into datetime."""
diff --git a/sdk/core/azure-core/azure/core/pipeline/transport/_base.py b/sdk/core/azure-core/azure/core/pipeline/transport/_base.py
index 589d5549c584..4185df32e1d3 100644
--- a/sdk/core/azure-core/azure/core/pipeline/transport/_base.py
+++ b/sdk/core/azure-core/azure/core/pipeline/transport/_base.py
@@ -74,7 +74,7 @@
     PipelineContext,
 )
 from .._tools import await_result as _await_result
-from ..._utils import _case_insensitive_dict
+from ...utils._utils import _case_insensitive_dict
 
 
 if TYPE_CHECKING:
diff --git a/sdk/core/azure-core/azure/core/_utils.py b/sdk/core/azure-core/azure/core/utils/_utils.py
similarity index 100%
rename from sdk/core/azure-core/azure/core/_utils.py
rename to sdk/core/azure-core/azure/core/utils/_utils.py
diff --git a/sdk/core/azure-core/tests/test_messaging_cloud_event.py b/sdk/core/azure-core/tests/test_messaging_cloud_event.py
index c82fa4f55370..7930a7719cac 100644
--- a/sdk/core/azure-core/tests/test_messaging_cloud_event.py
+++ b/sdk/core/azure-core/tests/test_messaging_cloud_event.py
@@ -7,7 +7,7 @@
 import datetime
 
 from azure.core.messaging import CloudEvent
-from azure.core._utils import _convert_to_isoformat
+from azure.core.utils._utils import _convert_to_isoformat
 from azure.core.serialization import NULL
 
 # Cloud Event tests

From 869afc6b851176626803ae2b94865fce0e8d85c3 Mon Sep 17 00:00:00 2001
From: Xiang Yan <xiangyan@microsoft.com>
Date: Thu, 24 Jun 2021 11:02:34 -0700
Subject: [PATCH 2/2] update

---
 sdk/core/azure-core/azure/core/messaging.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/core/azure-core/azure/core/messaging.py b/sdk/core/azure-core/azure/core/messaging.py
index d2027dcf4688..7021b3e7ace5 100644
--- a/sdk/core/azure-core/azure/core/messaging.py
+++ b/sdk/core/azure-core/azure/core/messaging.py
@@ -8,7 +8,7 @@
 from base64 import b64decode
 from datetime import datetime
 from .utils._utils import _convert_to_isoformat, TZ_UTC
-from azure.core.serialization import NULL
+from .serialization import NULL
 
 try:
     from typing import TYPE_CHECKING, cast, Union