Merge "No more python path changes"

6 files changed, 7 insertions, 28 deletions

diff --git a/keystone/controllers/version.py b/keystone/controllers/version.py
index 8c728d5e..4a4f8645 100644
--- a/keystone/controllers/version.py
+++ b/keystone/controllers/version.py
@@ -1,8 +1,7 @@
 import os
 from webob import Response
 
-# If ../../keystone/__init__.py exists, add ../ to Python search path, so that
-# it will override what happens to be installed in /usr/(local/)lib/python...
+# Calculate root path (to get to static files)
 possible_topdir = os.path.normpath(os.path.join(os.path.dirname(__file__),
                                                 os.pardir,
                                                 os.pardir))
diff --git a/keystone/frontends/d5_compat.py b/keystone/frontends/d5_compat.py
index 2fea0b05..1a2522c6 100644
--- a/keystone/frontends/d5_compat.py
+++ b/keystone/frontends/d5_compat.py
@@ -45,16 +45,8 @@ import json
 from lxml import etree
 import os
 import sys
-
 from webob.exc import Request
 
-POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
-                                   os.pardir,
-                                   os.pardir,
-                                   os.pardir))
-if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'keystone', '__init__.py')):
-    sys.path.insert(0, POSSIBLE_TOPDIR)
-
 from keystone.logic.types import fault
 import keystone.utils as utils
 
diff --git a/keystone/frontends/legacy_token_auth.py b/keystone/frontends/legacy_token_auth.py
index 1577d587..3dcc1c84 100644
--- a/keystone/frontends/legacy_token_auth.py
+++ b/keystone/frontends/legacy_token_auth.py
@@ -26,20 +26,12 @@ receives into custom headers defined in properties and returns
 the response.
 """
 
+import ast
+import json
 import os
 import sys
-import json
-import ast
-
 from webob.exc import Request
 
-POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
-                                   os.pardir,
-                                   os.pardir,
-                                   os.pardir))
-if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'keystone', '__init__.py')):
-    sys.path.insert(0, POSSIBLE_TOPDIR)
-
 import keystone.utils as utils
 
 PROTOCOL_NAME = "Legacy Authentication"
diff --git a/keystone/test/unit/base.py b/keystone/test/unit/base.py
index fe89d362..864fe606 100644
--- a/keystone/test/unit/base.py
+++ b/keystone/test/unit/base.py
@@ -20,14 +20,11 @@ import datetime
 import functools
 import httplib
 import logging
+from lxml import etree, objectify
 import pprint
-import sys
 import os
-sys.path.append(os.path.abspath(os.path.join(os.path.abspath(__file__),
-                                '..', '..', '..', '..', '..', 'keystone')))
+import sys
 import unittest2 as unittest
-
-from lxml import etree, objectify
 import webob
 
 from keystone import server
diff --git a/keystone/test/unit/test_keystone_manage.py b/keystone/test/unit/test_keystone_manage.py
index efa2c589..08581692 100644
--- a/keystone/test/unit/test_keystone_manage.py
+++ b/keystone/test/unit/test_keystone_manage.py
@@ -3,6 +3,7 @@ import subprocess
 import sys
 import unittest
 
+# Calculate root path so ewe call files in bin
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(__file__),
                                    os.pardir,
                                    os.pardir,
diff --git a/keystone/tools/tracer.py b/keystone/tools/tracer.py
index efdb4b0b..51bc52e6 100644
--- a/keystone/tools/tracer.py
+++ b/keystone/tools/tracer.py
@@ -88,9 +88,7 @@ if '--trace-calls' in sys.argv:
         if 'macosx' in func_filename:
             return
         func_line_no = frame.f_lineno
-        # If ../../keystone/__init__.py exists, add ../ to Python search path,
-        # so that it will override what happens to be installed in
-        # /usr/(local/)lib/python...
+        # Calculate root project path
         possible_topdir = os.path.normpath(os.path.join(
                                            os.path.abspath(sys.argv[0]),
                                            os.pardir,