summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@agendaless.com>2009-08-27 14:34:47 +0000
committerChris McDonough <chrism@agendaless.com>2009-08-27 14:34:47 +0000
commit53edffcc361c057e5349dd257998e3b281a2a801 (patch)
tree8fb3de14a79f5c9d3f2b1aec2890e3d2bc3d5587
parent2234c998d4eb7672065fb02c4974c0535f409dca (diff)
downloadpyramid-53edffcc361c057e5349dd257998e3b281a2a801.tar.gz
pyramid-53edffcc361c057e5349dd257998e3b281a2a801.tar.bz2
pyramid-53edffcc361c057e5349dd257998e3b281a2a801.zip
Deal with Windows.
-rw-r--r--repoze/bfg/router.py1
-rw-r--r--repoze/bfg/view.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/repoze/bfg/router.py b/repoze/bfg/router.py
index db7d4c174..346e8f42f 100644
--- a/repoze/bfg/router.py
+++ b/repoze/bfg/router.py
@@ -228,6 +228,7 @@ def make_app(root_factory, package=None, filename='configure.zcml',
settings = Settings(get_options(options))
filename = settings['configure_zcml']
+ # not os.path.isabs below for windows systems
if (':' in filename) and (not os.path.isabs(filename)):
package, filename = filename.split(':', 1)
__import__(package)
diff --git a/repoze/bfg/view.py b/repoze/bfg/view.py
index 3fd5a8499..4fea8bf84 100644
--- a/repoze/bfg/view.py
+++ b/repoze/bfg/view.py
@@ -167,7 +167,8 @@ class static(object):
if os.path.isabs(root_dir):
self.app = StaticURLParser(root_dir, cache_max_age=cache_max_age)
return
- if ':' in root_dir:
+ # 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: