parent: 378a48 | patch | commitdiff
John Anderson
2015-01-22 c66adb8cf248997a9e5476cdbc55c48e23ae3029
refs
author John Anderson <sontek@gmail.com>
Thursday, January 22, 2015 23:12 +0100
committer John Anderson <sontek@gmail.com>
Thursday, January 22, 2015 23:16 +0100
commitc66adb8cf248997a9e5476cdbc55c48e23ae3029
tree fa0dfa9a45203f7425526860f1340561332fe199 tree | zip | gz
parent 378a4817c25720588adea917fbba964a8ab7b6a5 view | diff 
Backport proutes improvements from 1.6 to 1.5

Conflicts:
	CHANGES.txt
7 files modified
1074 ■■■■■ changed files
CHANGES.txt 5 ●●●●● diff | view | raw | blame | history
docs/narr/commandline.rst 52 ●●●●● diff | view | raw | blame | history
pyramid/config/routes.py 6 ●●●●● diff | view | raw | blame | history
pyramid/scripts/proutes.py 380 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/dummy.py 2 ●●●●● diff | view | raw | blame | history
pyramid/tests/test_scripts/test_proutes.py 620 ●●●●● diff | view | raw | blame | history
pyramid/urldispatch.py 9 ●●●●● diff | view | raw | blame | history