From 89edb739784863cbdb0884c63e3b1a4ef4e7cf5d Mon Sep 17 00:00:00 2001 From: Takafumi Arakaki Date: Sat, 4 May 2013 17:58:02 +0200 Subject: [PATCH] Fix failure due to rebase --- jedi/modules.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jedi/modules.py b/jedi/modules.py index 462e6989..bb3d4303 100644 --- a/jedi/modules.py +++ b/jedi/modules.py @@ -22,6 +22,8 @@ import os from ast import literal_eval from jedi._compatibility import exec_function, unicode +from jedi import settings +from jedi import parsing from jedi import cache from jedi import parsing_representation as pr from jedi import fast_parser