diff options
| author | Chris McDonough <chrism@plope.com> | 2011-03-29 14:50:14 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-03-29 14:50:14 -0400 |
| commit | 379b47da5f4f820af7d54a6d07553eadbd752f3b (patch) | |
| tree | 17ab49cc8cc4444ec3af179cb1bdc81af7265edd | |
| parent | 81e89c7f5bf2745d6acd1f4222cd55cf9adbdeab (diff) | |
| download | pyramid-379b47da5f4f820af7d54a6d07553eadbd752f3b.tar.gz pyramid-379b47da5f4f820af7d54a6d07553eadbd752f3b.tar.bz2 pyramid-379b47da5f4f820af7d54a6d07553eadbd752f3b.zip | |
condition coverage
| -rw-r--r-- | pyramid/static.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pyramid/static.py b/pyramid/static.py index 86f596640..eec465949 100644 --- a/pyramid/static.py +++ b/pyramid/static.py @@ -190,8 +190,8 @@ class static_view(object): # package_name is for bw compat; it is preferred to pass in a # package-relative path as root_dir # (e.g. ``anotherpackage:foo/static``). - caller_package_name = caller_package().__name__ - package_name = package_name or caller_package_name + if package_name is None: + package_name = caller_package().__name__ package_name, root_dir = resolve_asset_spec(root_dir, package_name) if package_name is None: app = StaticURLParser(root_dir, cache_max_age=cache_max_age) |