Merge pull request #7781 from germangh/master

BUG: Prevent config paths to contain python keywords

Author: jreback

pandas/core/config.py

@@ -445,7 +445,7 @@ def register_option(key, defval, doc='', validator=None, cb=None):
     for k in path:
         if not bool(re.match('^' + tokenize.Name + '$', k)):
             raise ValueError("%s is not a valid identifier" % k)
-        if keyword.iskeyword(key):
+        if keyword.iskeyword(k):
             raise ValueError("%s is a python keyword" % k)
 
     cursor = _global_config

pandas/tests/test_config.py

@@ -59,6 +59,7 @@ def test_register_option(self):
 
         # no python keywords
         self.assertRaises(ValueError, self.cf.register_option, 'for', 0)
+        self.assertRaises(ValueError, self.cf.register_option, 'a.for.b', 0)
         # must be valid identifier (ensure attribute access works)
         self.assertRaises(ValueError, self.cf.register_option,
                           'Oh my Goddess!', 0)