diff --git a/core/dbt/utils.py b/core/dbt/utils.py index 11101a59fbb..def02a55f6c 100644 --- a/core/dbt/utils.py +++ b/core/dbt/utils.py @@ -72,42 +72,30 @@ def get_model_name_or_none(model): def get_dbt_macro_name(name): if name is None: raise dbt.exceptions.InternalException('Got None for a macro name!') - return '{}{}'.format(MACRO_PREFIX, name) + return f'{MACRO_PREFIX}{name}' def get_dbt_docs_name(name): if name is None: raise dbt.exceptions.InternalException('Got None for a doc name!') - return '{}{}'.format(DOCS_PREFIX, name) + return f'{DOCS_PREFIX}{name}' def get_materialization_macro_name(materialization_name, adapter_type=None, with_prefix=True): if adapter_type is None: adapter_type = 'default' - - name = 'materialization_{}_{}'.format(materialization_name, adapter_type) - - if with_prefix: - return get_dbt_macro_name(name) - else: - return name + name = f'materialization_{materialization_name}_{adapter_type}' + return get_dbt_macro_name(name) if with_prefix else name def get_docs_macro_name(docs_name, with_prefix=True): - if with_prefix: - return get_dbt_docs_name(docs_name) - else: - return docs_name + return get_dbt_docs_name(docs_name) if with_prefix else docs_name def get_test_macro_name(test_name, with_prefix=True): name = f'test_{test_name}' - - if with_prefix: - return get_dbt_macro_name(name) - else: - return name + return get_dbt_macro_name(name) if with_prefix else name def split_path(path):