feat(redis): undeprecate resource name helper methods, add 2.7 deprecation warning (via synth) (#10049)

yoshi-automation · busunkim96 · commit e04d1dbc9b96 · 2020-01-07T16:42:54.000-08:00
diff --git a/redis/google/cloud/redis_v1/__init__.py b/redis/google/cloud/redis_v1/__init__.py
@@ -16,12 +16,23 @@
 
 
 from __future__ import absolute_import
+import sys
+import warnings
 
 from google.cloud.redis_v1 import types
 from google.cloud.redis_v1.gapic import cloud_redis_client
 from google.cloud.redis_v1.gapic import enums
 
 
+if sys.version_info[:2] == (2, 7):
+    message = (
+        "A future version of this library will drop support for Python 2.7."
+        "More details about Python 2 support for Google Cloud Client Libraries"
+        "can be found at https://cloud.google.com/python/docs/python2-sunset/"
+    )
+    warnings.warn(message, DeprecationWarning)
+
+
 class CloudRedisClient(cloud_redis_client.CloudRedisClient):
     __doc__ = cloud_redis_client.CloudRedisClient.__doc__
     enums = enums
diff --git a/redis/google/cloud/redis_v1/gapic/cloud_redis_client.py b/redis/google/cloud/redis_v1/gapic/cloud_redis_client.py
@@ -100,12 +100,7 @@ def from_service_account_file(cls, filename, *args, **kwargs):
 
     @classmethod
     def instance_path(cls, project, location, instance):
-        """DEPRECATED. Return a fully-qualified instance string."""
-        warnings.warn(
-            "Resource name helper functions are deprecated.",
-            PendingDeprecationWarning,
-            stacklevel=1,
-        )
+        """Return a fully-qualified instance string."""
         return google.api_core.path_template.expand(
             "projects/{project}/locations/{location}/instances/{instance}",
             project=project,
@@ -115,12 +110,7 @@ def instance_path(cls, project, location, instance):
 
     @classmethod
     def location_path(cls, project, location):
-        """DEPRECATED. Return a fully-qualified location string."""
-        warnings.warn(
-            "Resource name helper functions are deprecated.",
-            PendingDeprecationWarning,
-            stacklevel=1,
-        )
+        """Return a fully-qualified location string."""
         return google.api_core.path_template.expand(
             "projects/{project}/locations/{location}",
             project=project,
diff --git a/redis/google/cloud/redis_v1beta1/__init__.py b/redis/google/cloud/redis_v1beta1/__init__.py
@@ -16,12 +16,23 @@
 
 
 from __future__ import absolute_import
+import sys
+import warnings
 
 from google.cloud.redis_v1beta1 import types
 from google.cloud.redis_v1beta1.gapic import cloud_redis_client
 from google.cloud.redis_v1beta1.gapic import enums
 
 
+if sys.version_info[:2] == (2, 7):
+    message = (
+        "A future version of this library will drop support for Python 2.7."
+        "More details about Python 2 support for Google Cloud Client Libraries"
+        "can be found at https://cloud.google.com/python/docs/python2-sunset/"
+    )
+    warnings.warn(message, DeprecationWarning)
+
+
 class CloudRedisClient(cloud_redis_client.CloudRedisClient):
     __doc__ = cloud_redis_client.CloudRedisClient.__doc__
     enums = enums
diff --git a/redis/google/cloud/redis_v1beta1/gapic/cloud_redis_client.py b/redis/google/cloud/redis_v1beta1/gapic/cloud_redis_client.py
@@ -101,12 +101,7 @@ def from_service_account_file(cls, filename, *args, **kwargs):
 
     @classmethod
     def instance_path(cls, project, location, instance):
-        """DEPRECATED. Return a fully-qualified instance string."""
-        warnings.warn(
-            "Resource name helper functions are deprecated.",
-            PendingDeprecationWarning,
-            stacklevel=1,
-        )
+        """Return a fully-qualified instance string."""
         return google.api_core.path_template.expand(
             "projects/{project}/locations/{location}/instances/{instance}",
             project=project,
@@ -116,12 +111,7 @@ def instance_path(cls, project, location, instance):
 
     @classmethod
     def location_path(cls, project, location):
-        """DEPRECATED. Return a fully-qualified location string."""
-        warnings.warn(
-            "Resource name helper functions are deprecated.",
-            PendingDeprecationWarning,
-            stacklevel=1,
-        )
+        """Return a fully-qualified location string."""
         return google.api_core.path_template.expand(
             "projects/{project}/locations/{location}",
             project=project,
diff --git a/redis/synth.metadata b/redis/synth.metadata
