Fix failure due to rebase

2013-05-04 17:58:02 +02:00
parent 3d0458bca9
commit 89edb73978
1 changed files with 2 additions and 0 deletions
--- 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