summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-10-13 14:49:35 -0700
committerChris McDonough <chrism@plope.com>2011-10-13 14:49:35 -0700
commit1f61fc717d00523f7f79df7e84f4b39a95cb57cd (patch)
tree57357a9f73c00cb68b45152d95e237782c33fc45
parentc169055f79c30442ac923714f30d3e1bcf40d289 (diff)
parent49425bcce4f754d706bb7917f24c7e1b36231d3c (diff)
downloadpyramid-1f61fc717d00523f7f79df7e84f4b39a95cb57cd.tar.gz
pyramid-1f61fc717d00523f7f79df7e84f4b39a95cb57cd.tar.bz2
pyramid-1f61fc717d00523f7f79df7e84f4b39a95cb57cd.zip
Merge pull request #317 from inneos/patch-3
fix static_url docstring about absolute path
-rw-r--r--pyramid/url.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/pyramid/url.py b/pyramid/url.py
index 862d48b82..617529955 100644
--- a/pyramid/url.py
+++ b/pyramid/url.py
@@ -340,10 +340,9 @@ class URLMethodsMixin(object):
The ``path`` argument points at a file or directory on disk which
a URL should be generated for. The ``path`` may be either a
- relative path (e.g. ``static/foo.css``) or a :term:`asset
- specification` (e.g. ``mypackage:static/foo.css``). A ``path``
- may not be an absolute filesystem path (a :exc:`ValueError` will
- be raised if this function is supplied with an absolute path).
+ relative path (e.g. ``static/foo.css``) or an absolute path (e.g.
+ ``/abspath/to/static/foo.css``) or a :term:`asset specification`
+ (e.g. ``mypackage:static/foo.css``).
The purpose of the ``**kw`` argument is the same as the purpose of
the :meth:`pyramid.request.Request.route_url` ``**kw`` argument. See