diff options
| author | Chris McDonough <chrism@plope.com> | 2010-11-17 01:33:29 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-11-17 01:33:29 -0500 |
| commit | bfee0aa99963ec88ccb9cdf0b41f40e72ee371e4 (patch) | |
| tree | 0c1e697dc914f570f625ea15f210d8cac36c57c8 | |
| parent | e6e0741dbfd90a8d6006bc195bfb5bdf8492ecfe (diff) | |
| download | pyramid-bfee0aa99963ec88ccb9cdf0b41f40e72ee371e4.tar.gz pyramid-bfee0aa99963ec88ccb9cdf0b41f40e72ee371e4.tar.bz2 pyramid-bfee0aa99963ec88ccb9cdf0b41f40e72ee371e4.zip | |
fix for jython
| -rw-r--r-- | pyramid/path.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pyramid/path.py b/pyramid/path.py index 2b557af5f..10647c073 100644 --- a/pyramid/path.py +++ b/pyramid/path.py @@ -44,7 +44,8 @@ def package_of(pkg_or_module): def caller_package(level=2, caller_module=caller_module): # caller_module in arglist for tests module = caller_module(level+1) - if '__init__.py' in getattr(module, '__file__', ''): # empty at >>> + f = getattr(module, '__file__', '') + if (('__init__.py' in f) or ('__init__$py' in f)): # empty at >>> # Module is a package return module # Go up one level to get package |