Merge "Add importing file to import warnings"

Jenkins · openstack-gerrit · commit 7d3d2b0c374c · 2016-09-11T02:24:37.000Z
diff --git a/openstackclient/api/auth.py b/openstackclient/api/auth.py
@@ -14,12 +14,15 @@
 # NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
 #                or Jun 2017.
 
+import inspect
 import sys
 
 from osc_lib.api.auth import *  # noqa
 
 
+parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
 sys.stderr.write(
     "WARNING: %s is deprecated and will be removed after Jun 2017. "
-    "Please use osc_lib.api.auth\n" % __name__
+    "Please use osc_lib.api.auth. This warning is caused by an "
+    "out-of-date import in %s\n" % (__name__, parent_import)
 )
diff --git a/openstackclient/common/command.py b/openstackclient/common/command.py
@@ -15,12 +15,15 @@
 # NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
 #                or Jun 2017.
 
+import inspect
 import sys
 
 from osc_lib.command.command import *  # noqa
 
 
+parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
 sys.stderr.write(
     "WARNING: %s is deprecated and will be removed after Jun 2017. "
-    "Please use osc_lib.command.command\n" % __name__
+    "Please use osc_lib.command.command. This warning is caused by an "
+    "out-of-date import in %s\n" % (__name__, parent_import)
 )
diff --git a/openstackclient/common/exceptions.py b/openstackclient/common/exceptions.py
@@ -14,12 +14,15 @@
 # NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
 #                or Jun 2017.
 
+import inspect
 import sys
 
 from osc_lib.exceptions import *  # noqa
 
 
+parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
 sys.stderr.write(
     "WARNING: %s is deprecated and will be removed after Jun 2017. "
-    "Please use osc_lib.exceptions\n" % __name__
+    "Please use osc_lib.exceptions. This warning is caused by an "
+    "out-of-date import in %s\n" % (__name__, parent_import)
 )
diff --git a/openstackclient/common/logs.py b/openstackclient/common/logs.py
@@ -14,13 +14,16 @@
 # NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
 #                or Jun 2017.
 
+import inspect
 import sys
 
 from osc_lib.logs import *  # noqa
 from osc_lib.logs import _FileFormatter  # noqa
 
 
+parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
 sys.stderr.write(
     "WARNING: %s is deprecated and will be removed after Jun 2017. "
-    "Please use osc_lib.logs\n" % __name__
+    "Please use osc_lib.logs. This warning is caused by an "
+    "out-of-date import in %s\n" % (__name__, parent_import)
 )
diff --git a/openstackclient/common/parseractions.py b/openstackclient/common/parseractions.py
@@ -14,12 +14,15 @@
 # NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
 #                or Jun 2017.
 
+import inspect
 import sys
 
 from osc_lib.cli.parseractions import *  # noqa
 
 
+parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
 sys.stderr.write(
     "WARNING: %s is deprecated and will be removed after Jun 2017. "
-    "Please use osc_lib.cli.parseractions\n" % __name__
+    "Please use osc_lib.cli.parseractions. This warning is caused by an "
+    "out-of-date import in %s\n" % (__name__, parent_import)
 )
diff --git a/openstackclient/common/timing.py b/openstackclient/common/timing.py
@@ -14,12 +14,15 @@
 # NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
 #                or Jun 2017.
 
+import inspect
 import sys
 
 from osc_lib.command.timing import *  # noqa
 
 
+parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
 sys.stderr.write(
     "WARNING: %s is deprecated and will be removed after Jun 2017. "
-    "Please use osc_lib.command.timing\n" % __name__
+    "Please use osc_lib.command.timing. This warning is caused by an "
+    "out-of-date import in %s\n" % (__name__, parent_import)
 )
diff --git a/openstackclient/common/utils.py b/openstackclient/common/utils.py
@@ -14,12 +14,15 @@
 # NOTE(dtroyer): This file is deprecated in Jun 2016, remove after 4.x release
 #                or Jun 2017.
 
+import inspect
 import sys
 
 from osc_lib.utils import *  # noqa
 
 
+parent_import = inspect.getouterframes(inspect.currentframe())[1][1]
 sys.stderr.write(
     "WARNING: %s is deprecated and will be removed after Jun 2017. "
-    "Please use osc_lib.utils\n" % __name__
+    "Please use osc_lib.utils. This warning is caused by an "
+    "out-of-date import in %s\n" % (__name__, parent_import)
 )
