Merge with the linter branch (especially the changes of pep484.

2016-06-07 13:51:25 +02:00
parent ed152e440e 9c0f3f9535
commit 82c76fa689
27 changed files with 883 additions and 108 deletions
--- a/jedi/debug.py
+++ b/jedi/debug.py
@@ -35,7 +35,12 @@ try:
                # after every output the stream is reset automatically we don't
                # need this.
                initialise.atexit_done = True
-                init()
+                try:
+                    init()
+                except Exception:
+                    # Colorama fails with initializing under vim and is buggy in
+                    # version 0.3.6.
+                    pass
            _inited = True

 except ImportError: