Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
pjbull committed Jul 7, 2021
1 parent 6f38fa9 commit 00e9722
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 21 deletions.
14 changes: 9 additions & 5 deletions cookiecutter/generate.py
Expand Up @@ -228,10 +228,9 @@ def render_and_create_dir(
link_tmpl = environment.from_string(symlink)
rendered_link = link_tmpl.render(**context)

logger.debug('Creating symlink from {} to {}'.format(
dir_to_create,
rendered_link
))
logger.debug(
'Creating symlink from {} to {}'.format(dir_to_create, rendered_link)
)

os.symlink(rendered_link, dir_to_create)
else:
Expand Down Expand Up @@ -366,7 +365,12 @@ def generate_files(
unrendered_dir = os.path.join(project_dir, root, d)
try:
render_and_create_dir(
unrendered_dir, context, output_dir, env, overwrite_if_exists, symlink=symlinks.get(d, None)
unrendered_dir,
context,
output_dir,
env,
overwrite_if_exists,
symlink=symlinks.get(d, None),
)
except UndefinedError as err:
if delete_project_on_failure:
Expand Down
30 changes: 14 additions & 16 deletions tests/test_generate_symlinks.py
Expand Up @@ -23,9 +23,11 @@ def remove_test_dir(request):
"""
Remove the folder that is created by the test.
"""

def fin_remove_test_dir():
if os.path.exists(TEST_OUTPUT_DIR):
utils.rmtree(TEST_OUTPUT_DIR)

request.addfinalizer(fin_remove_test_dir)


Expand All @@ -38,12 +40,10 @@ def test_symlinks():
"link_dir": "rendered_dir",
"sym_to_nontemp": "rendered_sym_to_original",
"sym_to_temp": "rendered_sym_to_rendered_dir",
"_copy_without_render": [
"copy_no_render"
]
"_copy_without_render": ["copy_no_render"],
}
},
repo_dir='tests/test-generate-symlinks'
repo_dir='tests/test-generate-symlinks',
)

dir_contents = os.listdir(TEST_OUTPUT_DIR)
Expand Down Expand Up @@ -76,8 +76,7 @@ def _test_symlink(root, link, points_to):
_test_symlink(TEST_OUTPUT_DIR, 'rendered_sym_to_original', 'original')

# rendered symlink, rendered target
_test_symlink(TEST_OUTPUT_DIR, 'rendered_sym_to_rendered_dir',
'rendered_dir')
_test_symlink(TEST_OUTPUT_DIR, 'rendered_sym_to_rendered_dir', 'rendered_dir')

# Test links that have not been rendered
non_rendered_dir = os.path.join(TEST_OUTPUT_DIR, 'copy_no_render')
Expand All @@ -94,17 +93,16 @@ def _test_symlink(root, link, points_to):
_test_symlink(non_rendered_dir, 'symlink', 'original')

# normal symlink, rendered target
_test_symlink(non_rendered_dir,
'symlink_to_rendered',
'{{ cookiecutter.link_dir }}')
_test_symlink(
non_rendered_dir, 'symlink_to_rendered', '{{ cookiecutter.link_dir }}'
)

# rendered symlink, not rendered target
_test_symlink(non_rendered_dir,
'{{ cookiecutter.sym_to_nontemp }}',
'original')
_test_symlink(non_rendered_dir, '{{ cookiecutter.sym_to_nontemp }}', 'original')

# rendered symlink, rendered target
_test_symlink(non_rendered_dir,
'{{ cookiecutter.sym_to_temp }}',
'{{ cookiecutter.link_dir }}')

_test_symlink(
non_rendered_dir,
'{{ cookiecutter.sym_to_temp }}',
'{{ cookiecutter.link_dir }}',
)

0 comments on commit 00e9722

Please sign in to comment.