if deprecated_scope is not None and scope != deprecated_scope:
      deprecated_vals = self.for_scope(deprecated_scope)
      explicit_keys = deprecated_vals.get_explicit_keys()
      if explicit_keys:
        warn_or_error(self.known_scope_to_info[scope].deprecated_scope_removal_version,
                      'scope {}'.format(deprecated_scope),
                      'Use scope {} instead (options: {})'.format(scope, ', '.join(explicit_keys)))
        # Note that a deprecated val will take precedence over a val of equal rank.
        # This makes the code a bit neater.
        values.update(deprecated_vals)

from the look of it, using the new scope will still go into the if statement