config: set default on missing default_context key

Closes: #1514 Closes: #1513
cookiecutter · Apr 11, 2021 · 4609471 · 4609471
1 parent 52dd185
commit 4609471
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/cookiecutter/config.py b/cookiecutter/config.py
@@ -45,7 +45,7 @@ def merge_configs(default, overwrite):
         # Make sure to preserve existing items in
         # nested dicts, for example `abbreviations`
         if isinstance(v, dict):
-            new_config[k] = merge_configs(default[k], v)
+            new_config[k] = merge_configs(default.get(k, {}), v)
         else:
             new_config[k] = v
 

diff --git a/tests/test-config/valid-config.yaml b/tests/test-config/valid-config.yaml
@@ -2,6 +2,12 @@ default_context:
     full_name: "Firstname Lastname"
     email: "firstname.lastname@gmail.com"
     github_username: "example"
+    project:
+        description: "description"
+        tags:
+            - "first"
+            - "second"
+            - "third"
 cookiecutters_dir: "/home/example/some-path-to-templates"
 replay_dir: "/home/example/some-path-to-replay-files"
 abbreviations:

diff --git a/tests/test_get_config.py b/tests/test_get_config.py
@@ -59,6 +59,10 @@ def test_get_config():
             'full_name': 'Firstname Lastname',
             'email': 'firstname.lastname@gmail.com',
             'github_username': 'example',
+            'project': {
+                'description': 'description',
+                'tags': ['first', 'second', 'third',],
+            },
         },
         'abbreviations': {
             'gh': 'https://github.com/{0}.git',

diff --git a/tests/test_get_user_config.py b/tests/test_get_user_config.py
@@ -46,6 +46,10 @@ def custom_config():
             'full_name': 'Firstname Lastname',
             'email': 'firstname.lastname@gmail.com',
             'github_username': 'example',
+            'project': {
+                'description': 'description',
+                'tags': ['first', 'second', 'third',],
+            },
         },
         'cookiecutters_dir': '/home/example/some-path-to-templates',
         'replay_dir': '/home/example/some-path-to-replay-files',