From 0f3454f897803468f55450206fe4522a013950c8 Mon Sep 17 00:00:00 2001
From: David Halter <davidhalter88@gmail.com>
Date: Mon, 29 Apr 2013 15:14:17 +0430
Subject: [PATCH] fix test problems, thx @tkf

---
 jedi/fast_parser.py     | 2 +-
 test/test_regression.py | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/jedi/fast_parser.py b/jedi/fast_parser.py
index 16e86d2e..bdf7ecc7 100644
--- a/jedi/fast_parser.py
+++ b/jedi/fast_parser.py
@@ -10,7 +10,7 @@ from jedi import settings
 from jedi import parsing
 from jedi import parsing_representation as pr
 from jedi import cache
-import common
+from jedi import common
 
 
 SCOPE_CONTENTS = ['asserts', 'subscopes', 'imports', 'statements', 'returns']
diff --git a/test/test_regression.py b/test/test_regression.py
index 57e70ec2..6c872d51 100755
--- a/test/test_regression.py
+++ b/test/test_regression.py
@@ -536,8 +536,6 @@ def test_settings_module():
     assert cache.settings is settings
 
 
-
-@pytest.mark.skip("not yet fully fixed")
 def test_no_duplicate_modules():
     """
     Make sure that import hack works as expected.