From e328eba97cc87a34e846693b62d17bdedaf27134 Mon Sep 17 00:00:00 2001 From: Armin Ronacher Date: Wed, 10 Aug 2011 17:51:24 +0200 Subject: [PATCH] Corrected prefix detection --- flask/app.py | 2 ++ tests/flask_tests.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/flask/app.py b/flask/app.py index b8f07fcd..03c7ce32 100644 --- a/flask/app.py +++ b/flask/app.py @@ -577,6 +577,8 @@ class Flask(_PackageBoundObject): parent, folder = os.path.split(site_parent) if folder.lower() == 'lib': base_dir = parent + elif os.path.basename(parent).lower() == 'lib': + base_dir = os.path.dirname(parent) else: base_dir = site_parent else: diff --git a/tests/flask_tests.py b/tests/flask_tests.py index 63ecad97..7b3f334e 100644 --- a/tests/flask_tests.py +++ b/tests/flask_tests.py @@ -1032,7 +1032,7 @@ class InstanceTestCase(unittest.TestCase): import types expected_prefix = os.path.abspath('foo') mod = types.ModuleType('myapp') - mod.__file__ = os.path.join(expected_prefix, 'lib', + mod.__file__ = os.path.join(expected_prefix, 'lib', 'python2.5', 'site-packages', 'myapp.py') sys.modules['myapp'] = mod try: @@ -1046,7 +1046,7 @@ class InstanceTestCase(unittest.TestCase): def test_installed_package_paths(self): import types expected_prefix = os.path.abspath('foo') - package_path = os.path.join(expected_prefix, 'lib', + package_path = os.path.join(expected_prefix, 'lib', 'python2.5', 'site-packages', 'myapp') mod = types.ModuleType('myapp') mod.__path__ = [package_path] @@ -1063,7 +1063,7 @@ class InstanceTestCase(unittest.TestCase): def test_prefix_installed_paths(self): import types expected_prefix = os.path.abspath(sys.prefix) - package_path = os.path.join(expected_prefix, 'lib', + package_path = os.path.join(expected_prefix, 'lib', 'python2.5', 'site-packages', 'myapp') mod = types.ModuleType('myapp') mod.__path__ = [package_path]