Merge pull request #1315 from lzach/fetchassignment_fix

willingc · web-flow · commit bee19dcc0f41 · 2020-05-11T07:52:27.000-07:00
ExchangeFetchAssignment deleting the wrong config
diff --git a/nbgrader/exchange/fetch_assignment.py b/nbgrader/exchange/fetch_assignment.py
@@ -17,11 +17,11 @@ def _load_config(self, cfg, **kwargs):
                 "Use ExchangeFetchAssignment in config, not ExchangeFetch. Outdated config:\n%s",
                 '\n'.join(
                     'ExchangeFetch.{key} = {value!r}'.format(key=key, value=value)
-                    for key, value in cfg.ExchangeFetchAssignment.items()
+                    for key, value in cfg.ExchangeFetch.items()
                 )
             )
             cfg.ExchangeFetchAssignment.merge(cfg.ExchangeFetch)
-            del cfg.ExchangeFetchAssignment
+            del cfg.ExchangeFetch
 
         super(ExchangeFetchAssignment, self)._load_config(cfg, **kwargs)
 

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,11 @@ def _load_config(self, cfg, **kwargs):`
`17`	`17`	`"Use ExchangeFetchAssignment in config, not ExchangeFetch. Outdated config:\n%s",`
`18`	`18`	`'\n'.join(`
`19`	`19`	`'ExchangeFetch.{key} = {value!r}'.format(key=key, value=value)`
`20`		`- for key, value in cfg.ExchangeFetchAssignment.items()`
	`20`	`+ for key, value in cfg.ExchangeFetch.items()`
`21`	`21`	`)`
`22`	`22`	`)`
`23`	`23`	`cfg.ExchangeFetchAssignment.merge(cfg.ExchangeFetch)`
`24`		`- del cfg.ExchangeFetchAssignment`
	`24`	`+ del cfg.ExchangeFetch`
`25`	`25`
`26`	`26`	`super(ExchangeFetchAssignment, self)._load_config(cfg, **kwargs)`
`27`	`27`