From 21826e7a34f8683c227712263b1e44f6e7c91559 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Mon, 17 Sep 2012 22:38:38 +0200 Subject: [PATCH 1/3] Moved jedi files to separate package folder --- __init__.py => jedi/__init__.py | 0 _compatibility.py => jedi/_compatibility.py | 0 api.py => jedi/api.py | 0 builtin.py => jedi/builtin.py | 0 debug.py => jedi/debug.py | 0 dynamic.py => jedi/dynamic.py | 0 evaluate.py => jedi/evaluate.py | 0 helpers.py => jedi/helpers.py | 0 imports.py => jedi/imports.py | 0 keywords.py => jedi/keywords.py | 0 {mixin => jedi/mixin}/_functools.py | 0 {mixin => jedi/mixin}/_sre.py | 0 {mixin => jedi/mixin}/_weakref.py | 0 {mixin => jedi/mixin}/builtins.py | 0 modules.py => jedi/modules.py | 0 parsing.py => jedi/parsing.py | 0 settings.py => jedi/settings.py | 0 17 files changed, 0 insertions(+), 0 deletions(-) rename __init__.py => jedi/__init__.py (100%) rename _compatibility.py => jedi/_compatibility.py (100%) rename api.py => jedi/api.py (100%) rename builtin.py => jedi/builtin.py (100%) rename debug.py => jedi/debug.py (100%) rename dynamic.py => jedi/dynamic.py (100%) rename evaluate.py => jedi/evaluate.py (100%) rename helpers.py => jedi/helpers.py (100%) rename imports.py => jedi/imports.py (100%) rename keywords.py => jedi/keywords.py (100%) rename {mixin => jedi/mixin}/_functools.py (100%) rename {mixin => jedi/mixin}/_sre.py (100%) rename {mixin => jedi/mixin}/_weakref.py (100%) rename {mixin => jedi/mixin}/builtins.py (100%) rename modules.py => jedi/modules.py (100%) rename parsing.py => jedi/parsing.py (100%) rename settings.py => jedi/settings.py (100%) diff --git a/__init__.py b/jedi/__init__.py similarity index 100% rename from __init__.py rename to jedi/__init__.py diff --git a/_compatibility.py b/jedi/_compatibility.py similarity index 100% rename from _compatibility.py rename to jedi/_compatibility.py diff --git a/api.py b/jedi/api.py similarity index 100% rename from api.py rename to jedi/api.py diff --git a/builtin.py b/jedi/builtin.py similarity index 100% rename from builtin.py rename to jedi/builtin.py diff --git a/debug.py b/jedi/debug.py similarity index 100% rename from debug.py rename to jedi/debug.py diff --git a/dynamic.py b/jedi/dynamic.py similarity index 100% rename from dynamic.py rename to jedi/dynamic.py diff --git a/evaluate.py b/jedi/evaluate.py similarity index 100% rename from evaluate.py rename to jedi/evaluate.py diff --git a/helpers.py b/jedi/helpers.py similarity index 100% rename from helpers.py rename to jedi/helpers.py diff --git a/imports.py b/jedi/imports.py similarity index 100% rename from imports.py rename to jedi/imports.py diff --git a/keywords.py b/jedi/keywords.py similarity index 100% rename from keywords.py rename to jedi/keywords.py diff --git a/mixin/_functools.py b/jedi/mixin/_functools.py similarity index 100% rename from mixin/_functools.py rename to jedi/mixin/_functools.py diff --git a/mixin/_sre.py b/jedi/mixin/_sre.py similarity index 100% rename from mixin/_sre.py rename to jedi/mixin/_sre.py diff --git a/mixin/_weakref.py b/jedi/mixin/_weakref.py similarity index 100% rename from mixin/_weakref.py rename to jedi/mixin/_weakref.py diff --git a/mixin/builtins.py b/jedi/mixin/builtins.py similarity index 100% rename from mixin/builtins.py rename to jedi/mixin/builtins.py diff --git a/modules.py b/jedi/modules.py similarity index 100% rename from modules.py rename to jedi/modules.py diff --git a/parsing.py b/jedi/parsing.py similarity index 100% rename from parsing.py rename to jedi/parsing.py diff --git a/settings.py b/jedi/settings.py similarity index 100% rename from settings.py rename to jedi/settings.py From a26023c5b97f352e8e592c3b16742ac7a9cf22b8 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Mon, 17 Sep 2012 22:38:52 +0200 Subject: [PATCH 2/3] Uppercased LICENSE.txt --- licence.txt => LICENSE.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename licence.txt => LICENSE.txt (100%) diff --git a/licence.txt b/LICENSE.txt similarity index 100% rename from licence.txt rename to LICENSE.txt From 80cf9a770906d84be3dbda4a1e7d580801ec69b2 Mon Sep 17 00:00:00 2001 From: Danilo Bargen Date: Mon, 17 Sep 2012 22:45:08 +0200 Subject: [PATCH 3/3] Fixed tests --- test/regression.py | 4 ++-- test/run.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/regression.py b/test/regression.py index 34be8961..9489662d 100755 --- a/test/regression.py +++ b/test/regression.py @@ -4,8 +4,8 @@ import sys import unittest from os.path import abspath, dirname -sys.path.append(abspath(dirname(abspath(__file__)) + '/..')) -os.chdir(os.path.dirname(os.path.abspath(__file__)) + '/..') +sys.path.append(abspath(dirname(abspath(__file__)) + '/../jedi')) +os.chdir(os.path.dirname(os.path.abspath(__file__)) + '/../jedi') sys.path.append('.') from _compatibility import is_py25 diff --git a/test/run.py b/test/run.py index 9d99db16..d5defc77 100755 --- a/test/run.py +++ b/test/run.py @@ -5,8 +5,8 @@ import re import traceback from os.path import abspath, dirname -sys.path.append(abspath(dirname(abspath(__file__)) + '/..')) -os.chdir(dirname(abspath(__file__)) + '/..') +sys.path.append(abspath(dirname(abspath(__file__)) + '/../jedi')) +os.chdir(dirname(abspath(__file__)) + '/../jedi') from _compatibility import unicode, BytesIO, reduce, literal_eval, is_py25 @@ -253,7 +253,7 @@ for arg in args: last = arg # completion tests: -completion_test_dir = 'test/completion' +completion_test_dir = '../test/completion' summary = [] tests_fail = 0