cpplint: keep the old import

2015-05-06 22:33:31 +02:00 · 2015-05-06 22:33:31 +02:00 · 8ef1fa7733
parent 085b80fdb3
commit 8ef1fa7733
1 changed files with 5 additions and 2 deletions
--- a/waflib/extras/cpplint.py
+++ b/waflib/extras/cpplint.py
@ -49,9 +49,12 @@ import logging
 import threading
 from waflib import Task, Build, TaskGen, Logs, Utils
 try:
-    from cpplint import ProcessFile, _cpplint_state
+    from cpplint.cpplint import ProcessFile, _cpplint_state
 except ImportError:
-    pass
+    try:
+        from cpplint import ProcessFile, _cpplint_state
+    except ImportError:
+        pass


 critical_errors = 0