Revert "Work around for ansible-collections#1083 (ansible-collections…

…#1086)" This reverts commit e0aeafd.
tremble · Sep 30, 2022 · 4f1e582 · 4f1e582
1 parent b330814
commit 4f1e582
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/changelogs/fragments/1083-__spec__-is-None.yml b/changelogs/fragments/1083-__spec__-is-None.yml
diff --git a/plugins/module_utils/cloud.py b/plugins/module_utils/cloud.py
@@ -32,12 +32,7 @@
 import time
 import functools
 import random
-
-try:
-    import ansible.module_utils.common.warnings as ansible_warnings
-    ANCIENT_ANSIBLE = False
-except ImportError:
-    ANCIENT_ANSIBLE = True
+import ansible.module_utils.common.warnings as ansible_warnings
 
 
 class BackoffIterator:
@@ -205,10 +200,9 @@ def backoff(cls, tries=10, delay=3, backoff=1.1, catch_extra_error_codes=None):
         """
         # This won't emit a warning (we don't have the context available to us), but will trigger
         # sanity failures as we prepare for 6.0.0
-        if not ANCIENT_ANSIBLE:
-            ansible_warnings.deprecate(
-                'CloudRetry.backoff has been deprecated, please use CloudRetry.exponential_backoff instead',
-                version='6.0.0', collection_name='amazon.aws')
+        ansible_warnings.deprecate(
+            'CloudRetry.backoff has been deprecated, please use CloudRetry.exponential_backoff instead',
+            version='6.0.0', collection_name='amazon.aws')
 
         return cls.exponential_backoff(
             retries=tries,