summaryrefslogtreecommitdiff
path: root/README.rst
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2017-05-12 21:24:15 -0700
committerGitHub <noreply@github.com>2017-05-12 21:24:15 -0700
commit5f3b95cf3e1b3005007e739d0e008b21cff2babf (patch)
treec69983404d7b9b8db62640809e6b81c5e46677b4 /README.rst
parentb5444950d84c507f26764a16021db6e01d0461e3 (diff)
parenta7d60de001ba14023d20d701d9697ad7d8de1dd4 (diff)
downloadpyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.tar.gz
pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.tar.bz2
pyramid-5f3b95cf3e1b3005007e739d0e008b21cff2babf.zip
Merge branch 'master' into change-to-localhost
Diffstat (limited to 'README.rst')
-rw-r--r--README.rst18
1 files changed, 9 insertions, 9 deletions
diff --git a/README.rst b/README.rst
index f05dd8bbf..5f42115df 100644
--- a/README.rst
+++ b/README.rst
@@ -1,16 +1,16 @@
Pyramid
=======
-.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=master
+.. image:: https://travis-ci.org/Pylons/pyramid.png?branch=1.9-branch
:target: https://travis-ci.org/Pylons/pyramid
:alt: master Travis CI Status
-.. image:: https://readthedocs.org/projects/pyramid/badge/?version=master
- :target: http://docs.pylonsproject.org/projects/pyramid/en/master/
+.. image:: https://readthedocs.org/projects/pyramid/badge/?version=1.9-branch
+ :target: http://docs.pylonsproject.org/projects/pyramid/en/1.9-branch/
:alt: Master Documentation Status
-.. image:: https://readthedocs.org/projects/pyramid/badge/?version=latest
- :target: http://docs.pylonsproject.org/projects/pyramid/en/latest/
+.. image:: https://readthedocs.org/projects/pyramid/badge/?version=1.9-branch
+ :target: http://docs.pylonsproject.org/projects/pyramid/en/1.9-branch/
:alt: Latest Documentation Status
.. image:: https://img.shields.io/badge/irc-freenode-blue.svg
@@ -31,10 +31,10 @@ and deployment more fun, more predictable, and more productive.
return Response('Hello %(name)s!' % request.matchdict)
if __name__ == '__main__':
- config = Configurator()
- config.add_route('hello', '/hello/{name}')
- config.add_view(hello_world, route_name='hello')
- app = config.make_wsgi_app()
+ with Configurator() as config:
+ config.add_route('hello', '/hello/{name}')
+ config.add_view(hello_world, route_name='hello')
+ app = config.make_wsgi_app()
server = make_server('0.0.0.0', 8080, app)
server.serve_forever()