Merge "Deprecated set_latent"

2 files changed, 4 insertions, 18 deletions

diff --git a/doc/source/cors.rst b/doc/source/cors.rst
index 765a681..ea19d9e 100644
--- a/doc/source/cors.rst
+++ b/doc/source/cors.rst
@@ -55,18 +55,6 @@ something like this::
     allow_headers=X-Custom-Header
     expose_headers=X-Custom-Header
 
-If your software requires specific headers or methods for proper operation, you
-may include these as latent properties. These will be evaluated in addition
-to any found in configuration::
-
-    from oslo_middleware import cors
-
-    app = cors.CORS(your_wsgi_application)
-    app.set_latent(allow_headers=['X-System-Header'],
-                   expose_headers=['X-System-Header'],
-                   allow_methods=['GET','PATCH'])
-
-
 Configuration for pastedeploy
 -----------------------------
 
@@ -92,12 +80,6 @@ configuration, this may be done as follows.::
     # Optional field, in case the program name is different from the project:
     oslo_config_program = oslo_project_name-api
 
-    # This method also permits setting latent properties, for any origins set
-    # in oslo config.
-    latent_allow_headers=X-Auth-Token
-    latent_expose_headers=X-Auth-Token
-    latent_methods=GET,PUT,POST
-
 Configuration Options
 ---------------------
 
diff --git a/oslo_middleware/cors.py b/oslo_middleware/cors.py
index 9da5d24..b53ad45 100644
--- a/oslo_middleware/cors.py
+++ b/oslo_middleware/cors.py
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import copy
+from debtcollector import moves
 import logging
 
 import debtcollector
@@ -245,6 +246,9 @@ class CORS(base.ConfigurableMiddleware):
                     'allow_headers': allow_headers
                 }
 
+    @moves.moved_method('set_defaults',
+                        message='CORS.set_latent has been deprecated in favor '
+                                'of oslo_middleware.cors.set_defaults')
     def set_latent(self, allow_headers=None, allow_methods=None,
                    expose_headers=None):
         '''Add a new latent property for this middleware.