diff options
| author | Chris McDonough <chrism@agendaless.com> | 2009-09-18 03:37:52 +0000 |
|---|---|---|
| committer | Chris McDonough <chrism@agendaless.com> | 2009-09-18 03:37:52 +0000 |
| commit | 600ea3d5c50c1907e5f389d3040644543fae9077 (patch) | |
| tree | 725073bb67b91af507797f0ea709ed67304793af /repoze/bfg/view.py | |
| parent | 43514664d60d00721bfe9b32d68c5d9dcdb2419a (diff) | |
| download | pyramid-600ea3d5c50c1907e5f389d3040644543fae9077.tar.gz pyramid-600ea3d5c50c1907e5f389d3040644543fae9077.tar.bz2 pyramid-600ea3d5c50c1907e5f389d3040644543fae9077.zip | |
Centralize resource_spec code.
Diffstat (limited to 'repoze/bfg/view.py')
| -rw-r--r-- | repoze/bfg/view.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/repoze/bfg/view.py b/repoze/bfg/view.py index 12c8b6f46..aa164f432 100644 --- a/repoze/bfg/view.py +++ b/repoze/bfg/view.py @@ -39,6 +39,7 @@ from repoze.bfg.security import Unauthorized from repoze.bfg.settings import get_settings from repoze.bfg.static import PackageURLParser from repoze.bfg.renderers import renderer_from_name +from repoze.bfg.resource import resource_spec try: all = all @@ -188,13 +189,9 @@ class static(object): if os.path.isabs(root_dir): self.app = StaticURLParser(root_dir, cache_max_age=cache_max_age) return - # not os.path.isabs below for windows systems - if (':' in root_dir) and (not os.path.isabs(root_dir)): - package_name, root_dir = root_dir.split(':', 1) - else: - if package_name is None: - package_name = caller_package().__name__ - + caller_package_name = caller_package().__name__ + spec = resource_spec(root_dir, package_name or caller_package_name) + package_name, root_dir = spec.split(':', 1) self.app = PackageURLParser(package_name, root_dir, cache_max_age=cache_max_age) |
