Merge 5666d2c into 66d5fef

Bachmann1234 · Dec 20, 2017 · a89af6f · a89af6f
2 parents 66d5fef + 5666d2c
commit a89af6f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+12/19/2017 v1.0.3
+
+ * Fix pylint 1.8.0 compatibility: configuration file path printed to stderr
+
 12/19/2017 v1.0.2
 
  * Fix bug where clover uses absolute path in its xml report

diff --git a/diff_cover/command_runner.py b/diff_cover/command_runner.py
@@ -41,7 +41,10 @@ def execute(command):
     stderr = _ensure_unicode(stderr)
     # after version 1.8.0 pylint writes a message to stderr:
     # Using config file {}
+    # OR
+    # No config file found, using default configuration
     stderr = re.sub(r'^Using config file .*$', '', stderr).strip()
+    stderr = re.sub(r'^No config file found, using default configuration$', '', stderr).strip()
     # If we get a non-empty output to stderr, raise an exception
     if bool(stderr) and process.returncode:
         raise CommandError(stderr)