Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
Pylons/pyramid
AlexMarshall12/pyramid
AndreaCrotti/pyramid
Cito/pyramid
DeanHodgkinson/pyramid
DrunkenCub/pyramid
HorizonXP/pyramid
Hquant/pyramid
IDSGPlayground/pyramid-tutorial-yuxin-aaron
JDeuce/pyramid
Javex/pyramid
MorphiX00/pyramid
RichardBarrell/pyramid
RyoAbe/pyramid
SMFOSS/pyramid
XiaonuoGantan/pyramid
aMunRieL/pyramid
aadabi/pyramid
abourget/pyramid
adamryan/pyramid
adroullier/pyramid
alanliang/pyramid
alertedsnake/pyramid
altoplano/pyramid
alvinyue/pyramid
antoneliasson/pyramid
archanmishra/pyramid
asolomentsev/pyramid
audoe/pyramid
audreyr/pyramid
bbinet/pyramid
bdyaniv/pyramid
bennihepp/pyramid
bertjwregeer/pyramid
blaflamme/pyramid
brianr/pyramid
bshanks/pyramid
cameronr/pyramid
caseman/pyramid
cburns/pyramid
cconrad/pyramid
cdt3/pyramid
cguardia/pyramid
cherschel/pyramid
cjw296/pyramid
cloudappsetup/pyramid
countvajhula/pyramid
csenger/pyramid
daado/pyramid
dahabit/pyramid
dairiki/pyramid
david-furminieux/pyramid
davidjb/pyramid
dbaty/pyramid
dekimsey/pyramid
deshank/pyramid
dfee/pyramid
dhavlik/pyramid
di/pyramid
dianaclarke/pyramid
diarmuidbourke/pyramid
dnouri/pyramid
domenkozar/pyramid
douglatornell/pyramid
dzinxed/pyramid
einSelbst/pyramid
elpargo/pyramid
endophage/pyramid
ericrasmussen/pyramid
esehara/pyramid
eugeneai/pyramid
firemyst/pyramid
giorgil2/pyramid
gregglind/pyramid
gulp-swe/pyramid
gwho/pyramid
hathawsh/pyramid
helduel/pyramid
hfeeki/pyramid
hlv42/pyramid
ikeikeikeike/pyramid
irskep/pyramid
jackncoke/pyramid
jaewonk/pyramid
jarda/pyramid
jbohman/pyramid
jgonera/pyramid
jhnwsk/pyramid
jinty/pyramid
jkrebs/pyramid
johbo/pyramid
johnwshipman/pyramid
jpcw/pyramid
jtwaleson/pyramid
junkafarian/pyramid
kaiquewdev/pyramid
kenmanheimer/pyramid
khink/pyramid
knzm/pyramid
kroman0/pyramid
ksava/pyramid
ktosiu/pyramid
kusut/pyramid
lambacck/pyramid
lanestevens/pyramid
ledmonster/pyramid
leonsim/pyramid
lgiorgi/pyramid
lgp171188/pyramid
llacroix/pyramid
lxneng/pyramid
m4webb/pyramid
mabbas512/pyramid
madjar/pyramid
malthe/pyramid
marcofalcioni/pyramid
markramm/pyramid
mattburgess/pyramid
mbra/pyramid
mccane/pyramid
mgedmin/pyramid
michaelBenin/pyramid
mitchellrj/pyramid
mjpieters/pyramid
mkerrin/pyramid
mmerickel/pyramid
mojocatplay/pyramid
msabramo/pyramid
mt3/pyramid
muellert/pyramid
mypandos/pyramid
nek4life/pyramid
niallo/pyramid
nik-cars/pyramid
nmclean/pyramid
pbugni/pyramid
placidrage/pyramid
polinom/pyramid
ponomar/pyramid
ppaez/pyramid
pyeek/pyramid
pylonsproject-jp/pyramid
pyramidcn/pyramid
r0b1n1983/pyramid
rach/pyramid
ralphbean/pyramid
ranjithtenz/pyramid
ravikishore1993/pyramid
raviteja2007/pyramid
rbu/pyramid
reedobrien/pyramid
replaceafill/pyramid
rick446/pyramid
rjweir/pyramid
rob0t7/pyramid
ronjouch/pyramid
ronnix/pyramid
rpatterson/pyramid
samuelrayment/pyramid
sawdog/pyramid
sbellem/pyramid
shazow/pyramid
shentonfreude/pyramid
sjuxax/pyramid
skopp/pyramid
slacy/pyramid
slinkp/pyramid
slmf/pyramid
soulcheck/pyramid
spiffytech/pyramid
sptremblay/pyramid
szicari-cars/pyramid
t2y/pyramid
taiSon/pyramid
tamentis/pyramid
thegeekinside/pyramid
timo/pyramid
tml/pyramid
tomlikestorock/pyramid
velox-zz/pyramid
vhallac/pyramid
viirak/pyramid
vinces1979/pyramid
vipera/pyramid
virhilo/pyramid
wangmxf/pyramid
waynet/pyramid
westurner/pyramid
wichert/pyramid
witsch/pyramid
wrystr/pyramid
wujiang/pyramid
wwitzel3/pyramid
xaav/pyramid
yhc003/pyramid
zesk06/pyramid
zhenghao1/pyramid
ztane/pyramid
zuiwanting/pyramid
zwack/pyramid
Nothing to show
Choose a Head Repository
Pylons/pyramid
AlexMarshall12/pyramid
AndreaCrotti/pyramid
Cito/pyramid
DeanHodgkinson/pyramid
DrunkenCub/pyramid
HorizonXP/pyramid
Hquant/pyramid
IDSGPlayground/pyramid-tutorial-yuxin-aaron
JDeuce/pyramid
Javex/pyramid
MorphiX00/pyramid
RichardBarrell/pyramid
RyoAbe/pyramid
SMFOSS/pyramid
XiaonuoGantan/pyramid
aMunRieL/pyramid
aadabi/pyramid
abourget/pyramid
adamryan/pyramid
adroullier/pyramid
alanliang/pyramid
alertedsnake/pyramid
altoplano/pyramid
alvinyue/pyramid
antoneliasson/pyramid
archanmishra/pyramid
asolomentsev/pyramid
audoe/pyramid
audreyr/pyramid
bbinet/pyramid
bdyaniv/pyramid
bennihepp/pyramid
bertjwregeer/pyramid
blaflamme/pyramid
brianr/pyramid
bshanks/pyramid
cameronr/pyramid
caseman/pyramid
cburns/pyramid
cconrad/pyramid
cdt3/pyramid
cguardia/pyramid
cherschel/pyramid
cjw296/pyramid
cloudappsetup/pyramid
countvajhula/pyramid
csenger/pyramid
daado/pyramid
dahabit/pyramid
dairiki/pyramid
david-furminieux/pyramid
davidjb/pyramid
dbaty/pyramid
dekimsey/pyramid
deshank/pyramid
dfee/pyramid
dhavlik/pyramid
di/pyramid
dianaclarke/pyramid
diarmuidbourke/pyramid
dnouri/pyramid
domenkozar/pyramid
douglatornell/pyramid
dzinxed/pyramid
einSelbst/pyramid
elpargo/pyramid
endophage/pyramid
ericrasmussen/pyramid
esehara/pyramid
eugeneai/pyramid
firemyst/pyramid
giorgil2/pyramid
gregglind/pyramid
gulp-swe/pyramid
gwho/pyramid
hathawsh/pyramid
helduel/pyramid
hfeeki/pyramid
hlv42/pyramid
ikeikeikeike/pyramid
irskep/pyramid
jackncoke/pyramid
jaewonk/pyramid
jarda/pyramid
jbohman/pyramid
jgonera/pyramid
jhnwsk/pyramid
jinty/pyramid
jkrebs/pyramid
johbo/pyramid
johnwshipman/pyramid
jpcw/pyramid
jtwaleson/pyramid
junkafarian/pyramid
kaiquewdev/pyramid
kenmanheimer/pyramid
khink/pyramid
knzm/pyramid
kroman0/pyramid
ksava/pyramid
ktosiu/pyramid
kusut/pyramid
lambacck/pyramid
lanestevens/pyramid
ledmonster/pyramid
leonsim/pyramid
lgiorgi/pyramid
lgp171188/pyramid
llacroix/pyramid
lxneng/pyramid
m4webb/pyramid
mabbas512/pyramid
madjar/pyramid
malthe/pyramid
marcofalcioni/pyramid
markramm/pyramid
mattburgess/pyramid
mbra/pyramid
mccane/pyramid
mgedmin/pyramid
michaelBenin/pyramid
mitchellrj/pyramid
mjpieters/pyramid
mkerrin/pyramid
mmerickel/pyramid
mojocatplay/pyramid
msabramo/pyramid
mt3/pyramid
muellert/pyramid
mypandos/pyramid
nek4life/pyramid
niallo/pyramid
nik-cars/pyramid
nmclean/pyramid
pbugni/pyramid
placidrage/pyramid
polinom/pyramid
ponomar/pyramid
ppaez/pyramid
pyeek/pyramid
pylonsproject-jp/pyramid
pyramidcn/pyramid
r0b1n1983/pyramid
rach/pyramid
ralphbean/pyramid
ranjithtenz/pyramid
ravikishore1993/pyramid
raviteja2007/pyramid
rbu/pyramid
reedobrien/pyramid
replaceafill/pyramid
rick446/pyramid
rjweir/pyramid
rob0t7/pyramid
ronjouch/pyramid
ronnix/pyramid
rpatterson/pyramid
samuelrayment/pyramid
sawdog/pyramid
sbellem/pyramid
shazow/pyramid
shentonfreude/pyramid
sjuxax/pyramid
skopp/pyramid
slacy/pyramid
slinkp/pyramid
slmf/pyramid
soulcheck/pyramid
spiffytech/pyramid
sptremblay/pyramid
szicari-cars/pyramid
t2y/pyramid
taiSon/pyramid
tamentis/pyramid
thegeekinside/pyramid
timo/pyramid
tml/pyramid
tomlikestorock/pyramid
velox-zz/pyramid
vhallac/pyramid
viirak/pyramid
vinces1979/pyramid
vipera/pyramid
virhilo/pyramid
wangmxf/pyramid
waynet/pyramid
westurner/pyramid
wichert/pyramid
witsch/pyramid
wrystr/pyramid
wujiang/pyramid
wwitzel3/pyramid
xaav/pyramid
yhc003/pyramid
zesk06/pyramid
zhenghao1/pyramid
ztane/pyramid
zuiwanting/pyramid
zwack/pyramid
Nothing to show
  • 3 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on Jan 29, 2017
Minor change
distinguish between Pyramid itself and view code raising the exception as in previous exception listing.

(cherry picked from commit eb166fb)
Minor change
"functions, classes or any callable that accept" was messing with the flow while reading.  Proposed change flows a little better for me.

(cherry picked from commit 87d8aba)
Showing with 2 additions and 3 deletions.
  1. +2 −3 docs/narr/views.rst
View
@@ -246,7 +246,7 @@ within view code, the result of the :term:`Not Found View` will be returned to
the user agent which performed the request.
If :exc:`~pyramid.httpexceptions.HTTPForbidden` is raised by Pyramid itself
within view code, the result of the :term:`Forbidden View` will be returned to
or within view code, the result of the :term:`Forbidden View` will be returned to
the user agent which performed the request.
.. index::
@@ -523,8 +523,7 @@ Alternate View Callable Argument/Calling Conventions
----------------------------------------------------
Usually view callables are defined to accept only a single argument:
``request``. However, view callables may alternately be defined as classes,
functions, or any callable that accept *two* positional arguments: a
``request``. However, a view callable may alternately be defined as any class, function, or callable that accepts *two* positional arguments: a
:term:`context` resource as the first argument and a :term:`request` as the
second argument.

No commit comments for this range