diff options
| author | Chris McDonough <chrism@plope.com> | 2012-02-22 19:29:10 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-02-22 19:29:10 -0500 |
| commit | 08f805a360185c648bfeccbbe568a97f0f036a0c (patch) | |
| tree | a828699d65eca5c0957448cee5fe0226d39d3f3d | |
| parent | 6d0bce1dabce486cd6a6bc1fa7668ca863c0656a (diff) | |
| parent | e032ee46a632d30a1a24d93cb6f273e93b4732de (diff) | |
| download | pyramid-08f805a360185c648bfeccbbe568a97f0f036a0c.tar.gz pyramid-08f805a360185c648bfeccbbe568a97f0f036a0c.tar.bz2 pyramid-08f805a360185c648bfeccbbe568a97f0f036a0c.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | docs/narr/assets.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/narr/assets.rst b/docs/narr/assets.rst index 4f80d33c7..2cc870619 100644 --- a/docs/narr/assets.rst +++ b/docs/narr/assets.rst @@ -374,7 +374,7 @@ do so, do things "by hand". First define the view callable. def favicon_view(request): here = os.path.dirname(__file__) - icon = open(os.path.join(here, 'static', 'favicon.ico')) + icon = open(os.path.join(here, 'static', 'favicon.ico'), 'rb') return Response(content_type='image/x-icon', app_iter=icon) The above bit of code within ``favicon_view`` computes "here", which is a |