remove old_style_options from app and api

connexion/apis/abstract.py

@@ -40,7 +40,7 @@ class AbstractAPI(object):
     def __init__(self, specification, base_path=None, arguments=None,
                  validate_responses=False, strict_validation=False, resolver=None,
                  auth_all_paths=False, debug=False, resolver_error_handler=None,
-                 validator_map=None, pythonic_params=False, options=None, **old_style_options):
+                 validator_map=None, pythonic_params=False, options=None):
         """
         :type specification: pathlib.Path | dict
         :type base_path: str | None
@@ -60,21 +60,12 @@ def __init__(self, specification, base_path=None, arguments=None,
         :type pythonic_params: bool
         :param options: New style options dictionary.
         :type options: dict | None
-        :param old_style_options: Old style options support for backward compatibility. Preference is
-                                  what is defined in `options` parameter.
         """
         self.debug = debug
         self.validator_map = validator_map
         self.resolver_error_handler = resolver_error_handler
 
-        self.options = ConnexionOptions(old_style_options)
-        # options is added last to preserve the highest priority
-        self.options = self.options.extend(options)
-
-        # TODO: Remove this in later versions (Current version is 1.1.9)
-        if base_path is None and 'base_url' in old_style_options:
-            base_path = old_style_options['base_url']
-            logger.warning("Parameter base_url should be no longer used. Use base_path instead.")
+        self.options = ConnexionOptions(options)
 
         logger.debug('Loading specification: %s', specification,
                      extra={'swagger_yaml': specification,

connexion/apps/abstract.py

@@ -14,7 +14,7 @@
 class AbstractApp(object):
     def __init__(self, import_name, api_cls, port=None, specification_dir='',
                  host=None, server=None, arguments=None, auth_all_paths=False, debug=False,
-                 validator_map=None, options=None, **old_style_options):
+                 validator_map=None, options=None):
         """
         :param import_name: the name of the application package
         :type import_name: str
@@ -47,9 +47,7 @@ def __init__(self, import_name, api_cls, port=None, specification_dir='',
         self.auth_all_paths = auth_all_paths
         self.validator_map = validator_map
 
-        self.options = ConnexionOptions(old_style_options)
-        # options is added last to preserve the highest priority
-        self.options = self.options.extend(options)  # type: ConnexionOptions
+        self.options = ConnexionOptions(options)
 
         self.app = self.create_app()
         self.server = server
@@ -90,7 +88,7 @@ def set_errors_handlers(self):
     def add_api(self, specification, base_path=None, arguments=None,
                 auth_all_paths=None, validate_responses=False,
                 strict_validation=False, resolver=Resolver(), resolver_error=None,
-                pythonic_params=False, options=None, **old_style_options):
+                pythonic_params=False, options=None):
         """
         Adds an API to the application based on a swagger file or API dict
 
@@ -115,9 +113,6 @@ def add_api(self, specification, base_path=None, arguments=None,
         :type pythonic_params: bool
         :param options: New style options dictionary.
         :type options: dict | None
-        :param old_style_options: Old style options support for backward compatibility. Preference is
-                                  what is defined in `options` parameter.
-        :type old_style_options: dict
         :rtype: AbstractAPI
         """
         # Turn the resolver_error code into a handler object
@@ -138,12 +133,7 @@ def add_api(self, specification, base_path=None, arguments=None,
         else:
             specification = self.specification_dir / specification
 
-        # Old style options have higher priority compared to the already
-        # defined options in the App class
-        api_options = self.options.extend(old_style_options)
-
-        # locally defined options are added last to preserve highest priority
-        api_options = api_options.extend(options)
+        api_options = self.options.extend(options)
 
         api = self.api_cls(specification,
                            base_path=base_path,