Merge pull request #16 from Carreau/warn-warning

log.warn deprecated for log.warning
ipython · May 11, 2015 · 6c57d78 · 6c57d78
2 parents df9c2f3 + fb1147a
commit 6c57d78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/traitlets/config/application.py b/traitlets/config/application.py
@@ -546,7 +546,7 @@ def load_config_file(self, filename, path=None):
         if len(loaded) > 1:
             collisions = loaded[0].collisions(loaded[1])
             if collisions:
-                self.log.warn("Collisions detected in {0}.py and {0}.json config files."
+                self.log.warning("Collisions detected in {0}.py and {0}.json config files."
                               " {0}.json has higher priority: {1}".format(
                               filename, json.dumps(collisions, indent=2),
                 ))

diff --git a/traitlets/config/loader.py b/traitlets/config/loader.py
@@ -407,7 +407,7 @@ def _convert_to_config(self, dictionary):
             version = dictionary.pop('version')
         else:
             version = 1
-            self.log.warn("Unrecognized JSON config file version, assuming version {}".format(version))
+            self.log.warning("Unrecognized JSON config file version, assuming version {}".format(version))
 
         if version == 1:
             return Config(dictionary)
@@ -636,7 +636,7 @@ def load_config(self, argv=None, aliases=None, flags=None):
                     lhs = aliases[lhs]
                 if '.' not in lhs:
                     # probably a mistyped alias, but not technically illegal
-                    self.log.warn("Unrecognized alias: '%s', it will probably have no effect.", raw)
+                    self.log.warning("Unrecognized alias: '%s', it will probably have no effect.", raw)
                 try:
                     self._exec_config_str(lhs, rhs)
                 except Exception: