Skip to content

Commit

Permalink
Merge c3691ed into b155476
Browse files Browse the repository at this point in the history
  • Loading branch information
samsy12 committed Oct 2, 2020
2 parents b155476 + c3691ed commit 3e0951b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions __main__.py
Expand Up @@ -2,5 +2,5 @@
import runpy


if __name__ == "__main__":
runpy.run_module("cookiecutter", run_name="__main__")
if __name__=="__main__":
runpy.run_module("cookiecutter",run_name="__main__")
6 changes: 3 additions & 3 deletions tests/conftest.py
@@ -1,4 +1,4 @@
"""pytest fixtures which are globally available throughout the suite."""
"""pytest fixtures which are globally available throughout the suite"""
import logging
import os
import shutil
Expand All @@ -15,7 +15,7 @@


def backup_dir(original_dir, backup_dir):
"""Generate backup directory based on original directory."""
"""Generate backup directory based on original directory"""
# If the default original_dir is pre-existing, move it to a temp location
if not os.path.isdir(original_dir):
return False
Expand All @@ -39,7 +39,7 @@ def restore_backup_dir(original_dir, backup_dir, original_dir_found):
if original_dir_is_dir and os.path.isdir(backup_dir):
utils.rmtree(original_dir)
else:
# Delete the created original_dir.
# Delete the created original_dir
# There's no backup because it never existed
if original_dir_is_dir:
utils.rmtree(original_dir)
Expand Down

0 comments on commit 3e0951b

Please sign in to comment.