From 4ec64a9763d18851f5a2e7cdd4b769bb25321149 Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Fri, 27 Dec 2013 01:35:33 +0100
Subject: [PATCH] move mixin to evaluate directory

---
 jedi/evaluate/builtin.py                 | 2 +-
 jedi/{ => evaluate}/mixin/_functools.pym | 0
 jedi/{ => evaluate}/mixin/_io.pym        | 0
 jedi/{ => evaluate}/mixin/_sqlite3.pym   | 0
 jedi/{ => evaluate}/mixin/_sre.pym       | 0
 jedi/{ => evaluate}/mixin/_weakref.pym   | 0
 jedi/{ => evaluate}/mixin/builtins.pym   | 0
 jedi/{ => evaluate}/mixin/datetime.pym   | 0
 jedi/{ => evaluate}/mixin/posix.pym      | 0
 setup.py                                 | 2 +-
 10 files changed, 2 insertions(+), 2 deletions(-)
 rename jedi/{ => evaluate}/mixin/_functools.pym (100%)
 rename jedi/{ => evaluate}/mixin/_io.pym (100%)
 rename jedi/{ => evaluate}/mixin/_sqlite3.pym (100%)
 rename jedi/{ => evaluate}/mixin/_sre.pym (100%)
 rename jedi/{ => evaluate}/mixin/_weakref.pym (100%)
 rename jedi/{ => evaluate}/mixin/builtins.pym (100%)
 rename jedi/{ => evaluate}/mixin/datetime.pym (100%)
 rename jedi/{ => evaluate}/mixin/posix.pym (100%)

diff --git a/jedi/evaluate/builtin.py b/jedi/evaluate/builtin.py
index 5270c5cd..9a57a854 100644
--- a/jedi/evaluate/builtin.py
+++ b/jedi/evaluate/builtin.py
@@ -165,7 +165,7 @@ class BuiltinModule(modules.CachedModule):
 
             if name == '__builtin__' and not is_py3k:
                 name = 'builtins'
-            path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+            path = os.path.dirname(os.path.abspath(__file__))
             with open(os.path.join(path, 'mixin', name) + '.pym') as f:
                 s = f.read()
         except IOError:
diff --git a/jedi/mixin/_functools.pym b/jedi/evaluate/mixin/_functools.pym
similarity index 100%
rename from jedi/mixin/_functools.pym
rename to jedi/evaluate/mixin/_functools.pym
diff --git a/jedi/mixin/_io.pym b/jedi/evaluate/mixin/_io.pym
similarity index 100%
rename from jedi/mixin/_io.pym
rename to jedi/evaluate/mixin/_io.pym
diff --git a/jedi/mixin/_sqlite3.pym b/jedi/evaluate/mixin/_sqlite3.pym
similarity index 100%
rename from jedi/mixin/_sqlite3.pym
rename to jedi/evaluate/mixin/_sqlite3.pym
diff --git a/jedi/mixin/_sre.pym b/jedi/evaluate/mixin/_sre.pym
similarity index 100%
rename from jedi/mixin/_sre.pym
rename to jedi/evaluate/mixin/_sre.pym
diff --git a/jedi/mixin/_weakref.pym b/jedi/evaluate/mixin/_weakref.pym
similarity index 100%
rename from jedi/mixin/_weakref.pym
rename to jedi/evaluate/mixin/_weakref.pym
diff --git a/jedi/mixin/builtins.pym b/jedi/evaluate/mixin/builtins.pym
similarity index 100%
rename from jedi/mixin/builtins.pym
rename to jedi/evaluate/mixin/builtins.pym
diff --git a/jedi/mixin/datetime.pym b/jedi/evaluate/mixin/datetime.pym
similarity index 100%
rename from jedi/mixin/datetime.pym
rename to jedi/evaluate/mixin/datetime.pym
diff --git a/jedi/mixin/posix.pym b/jedi/evaluate/mixin/posix.pym
similarity index 100%
rename from jedi/mixin/posix.pym
rename to jedi/evaluate/mixin/posix.pym
diff --git a/setup.py b/setup.py
index e01ea656..f8b2172b 100755
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ setup(name='jedi',
       keywords='python completion refactoring vim',
       long_description=readme,
       packages=['jedi', 'jedi.parser', 'jedi.evaluate'],
-      package_data={'jedi': ['mixin/*.pym']},
+      package_data={'jedi': ['evlaluate/evaluate/mixin/*.pym']},
       platforms=['any'],
       classifiers=[
           'Development Status :: 4 - Beta',