From 5857b4dbc99e6ec10174b1d75d701142de0e982b Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Sun, 5 Jan 2014 14:13:59 +0100
Subject: [PATCH] moved modules.py -> parser/user_context.py

---
 jedi/api.py                                 | 10 +++++-----
 jedi/{modules.py => parser/user_context.py} |  1 -
 jedi/refactoring.py                         |  1 -
 test/test_regression.py                     |  4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)
 rename jedi/{modules.py => parser/user_context.py} (99%)

diff --git a/jedi/api.py b/jedi/api.py
index d29992a8..35926fb6 100644
--- a/jedi/api.py
+++ b/jedi/api.py
@@ -15,20 +15,20 @@ import os
 import warnings
 from itertools import chain
 
+from jedi._compatibility import next, unicode, builtins
 from jedi.parser import Parser
 from jedi.parser import representation as pr
 from jedi.parser import fast
+from jedi.parser.user_context import UserContext
 from jedi import debug
 from jedi import settings
 from jedi import helpers
 from jedi import common
 from jedi import cache
-from jedi import modules
 from jedi import interpret
-from jedi._compatibility import next, unicode, builtins
+from jedi import keywords
 from jedi.evaluate import Evaluator, filter_private_variable
 from jedi.evaluate import representation as er
-from jedi import keywords
 from jedi.evaluate import builtin
 from jedi.evaluate import imports
 from jedi.evaluate import dynamic
@@ -88,7 +88,7 @@ class Script(object):
         api_classes.clear_caches()
         debug.reset_time()
         self.source = common.source_to_unicode(source, encoding)
-        self._user_context = modules.UserContext(self.source, self._pos)
+        self._user_context = UserContext(self.source, self._pos)
         self._evaluator = Evaluator()
         debug.speed('init')
 
@@ -364,7 +364,7 @@ class Script(object):
                 # reset cursor position:
                 (row, col) = call.name.end_pos
                 pos = (row, max(col - 1, 0))
-                self._user_context = modules.UserContext(self.source, pos)
+                self._user_context = UserContext(self.source, pos)
                 # then try to find the path again
                 goto_path = self._user_context.get_path_under_cursor()
 
diff --git a/jedi/modules.py b/jedi/parser/user_context.py
similarity index 99%
rename from jedi/modules.py
rename to jedi/parser/user_context.py
index 126668f3..6736ae28 100644
--- a/jedi/modules.py
+++ b/jedi/parser/user_context.py
@@ -8,7 +8,6 @@ from jedi import debug
 
 class UserContext(object):
     """
-
     :param source: The source code of the file.
     :param position: The position, the user is currently in. Only important \
     for the main file.
diff --git a/jedi/refactoring.py b/jedi/refactoring.py
index 85d153ac..7727c309 100644
--- a/jedi/refactoring.py
+++ b/jedi/refactoring.py
@@ -17,7 +17,6 @@ from __future__ import with_statement
 import difflib
 
 from jedi import common
-from jedi import modules
 from jedi import helpers
 from jedi.parser import representation as pr
 
diff --git a/test/test_regression.py b/test/test_regression.py
index c839faee..90087d85 100644
--- a/test/test_regression.py
+++ b/test/test_regression.py
@@ -12,7 +12,7 @@ import pytest
 import jedi
 from jedi import Script
 from jedi import api
-from jedi import modules
+from jedi.evaluate import imports
 from jedi.parser import Parser
 
 #jedi.set_debug_function()
@@ -84,7 +84,7 @@ class TestRegression(TestCase):
         src1 = "def r(a): return a"
         # Other fictional modules in another place in the fs.
         src2 = 'from .. import setup; setup.r(1)'
-        modules.load_module(os.path.abspath(fname), src2)
+        imports.load_module(os.path.abspath(fname), src2)
         result = Script(src1, path='../setup.py').goto_definitions()
         assert len(result) == 1
         assert result[0].description == 'class int'