diff options
| author | Steve Piercy <web@stevepiercy.com> | 2013-10-08 11:17:53 -0700 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2013-10-08 11:17:53 -0700 |
| commit | 0f1d6c019e796b43ce0061d36d1c5521fbbce7ee (patch) | |
| tree | 9b7c5e5df71a1fa2630edfd411438e66ae2104c9 | |
| parent | 4bc489d00bcb6013db1e9da00c3c16809eeb90fc (diff) | |
| parent | 4223668ee4c0d0ac0e981f3241d56ffa805ba6d1 (diff) | |
| download | pyramid-0f1d6c019e796b43ce0061d36d1c5521fbbce7ee.tar.gz pyramid-0f1d6c019e796b43ce0061d36d1c5521fbbce7ee.tar.bz2 pyramid-0f1d6c019e796b43ce0061d36d1c5521fbbce7ee.zip | |
Merge branch 'origin/master'
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | pyramid/config/routes.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 051328a02..6e73de823 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -21,6 +21,8 @@ Bug Fixes allowing traversal to continue. See https://github.com/Pylons/pyramid/issues/1104 +- Remove unused ``renderer`` argument from ``Configurator.add_route``. + Documentation ------------- diff --git a/pyramid/config/routes.py b/pyramid/config/routes.py index 9dca9e51e..4de4663a8 100644 --- a/pyramid/config/routes.py +++ b/pyramid/config/routes.py @@ -36,7 +36,6 @@ class RoutesConfiguratorMixin(object): request_param=None, traverse=None, custom_predicates=(), - renderer=None, use_global_views=False, path=None, pregenerator=None, |