Skip to content
This repository
Browse code

- Use the ``waitress`` WSGI server instead of ``wsgiref`` in scaffold…

…ing.
  • Loading branch information...
commit 030d10697cc52a5c26d19818140616a485f63428 1 parent 2d7d36c
Chris McDonough authored January 02, 2012

Showing 45 changed files with 67 additions and 86 deletions. Show diff stats Hide diff stats

  1. 2  CHANGES.txt
  2. 2  docs/narr/MyProject/development.ini
  3. 2  docs/narr/MyProject/production.ini
  4. 32  docs/narr/project.rst
  5. 4  docs/narr/startup.rst
  6. 2  docs/tutorials/wiki/src/authorization/development.ini
  7. 2  docs/tutorials/wiki/src/authorization/production.ini
  8. 1  docs/tutorials/wiki/src/authorization/setup.py
  9. 2  docs/tutorials/wiki/src/basiclayout/development.ini
  10. 2  docs/tutorials/wiki/src/basiclayout/production.ini
  11. 1  docs/tutorials/wiki/src/basiclayout/setup.py
  12. 2  docs/tutorials/wiki/src/models/development.ini
  13. 2  docs/tutorials/wiki/src/models/production.ini
  14. 1  docs/tutorials/wiki/src/models/setup.py
  15. 2  docs/tutorials/wiki/src/tests/development.ini
  16. 2  docs/tutorials/wiki/src/tests/production.ini
  17. 1  docs/tutorials/wiki/src/tests/setup.py
  18. 2  docs/tutorials/wiki/src/views/development.ini
  19. 2  docs/tutorials/wiki/src/views/production.ini
  20. 1  docs/tutorials/wiki/src/views/setup.py
  21. 2  docs/tutorials/wiki2/src/authorization/development.ini
  22. 2  docs/tutorials/wiki2/src/authorization/production.ini
  23. 1  docs/tutorials/wiki2/src/authorization/setup.py
  24. 2  docs/tutorials/wiki2/src/basiclayout/development.ini
  25. 2  docs/tutorials/wiki2/src/basiclayout/production.ini
  26. 1  docs/tutorials/wiki2/src/basiclayout/setup.py
  27. 2  docs/tutorials/wiki2/src/models/development.ini
  28. 2  docs/tutorials/wiki2/src/models/production.ini
  29. 1  docs/tutorials/wiki2/src/models/setup.py
  30. 2  docs/tutorials/wiki2/src/tests/development.ini
  31. 2  docs/tutorials/wiki2/src/tests/production.ini
  32. 1  docs/tutorials/wiki2/src/tests/setup.py
  33. 2  docs/tutorials/wiki2/src/views/development.ini
  34. 2  docs/tutorials/wiki2/src/views/production.ini
  35. 1  docs/tutorials/wiki2/src/views/setup.py
  36. 41  docs/whatsnew-1.3.rst
  37. 2  pyramid/scaffolds/alchemy/development.ini_tmpl
  38. 2  pyramid/scaffolds/alchemy/production.ini_tmpl
  39. 1  pyramid/scaffolds/alchemy/setup.py_tmpl
  40. 2  pyramid/scaffolds/starter/development.ini_tmpl
  41. 2  pyramid/scaffolds/starter/production.ini_tmpl
  42. 6  pyramid/scaffolds/starter/setup.py_tmpl
  43. 2  pyramid/scaffolds/zodb/development.ini_tmpl
  44. 2  pyramid/scaffolds/zodb/production.ini_tmpl
  45. 1  pyramid/scaffolds/zodb/setup.py_tmpl
2  CHANGES.txt
@@ -10,6 +10,8 @@ Features
10 10
   of the instance. Common use-cases for this would be to  get a database
11 11
   connection for the request or identify the current user.
12 12
 
  13
+- Use the ``waitress`` WSGI server instead of ``wsgiref`` in scaffolding.
  14
+
13 15
 1.3a3 (2011-12-21)
14 16
 ==================
15 17
 
2  docs/narr/MyProject/development.ini
@@ -10,7 +10,7 @@ pyramid.default_locale_name = en
10 10
 pyramid.includes = pyramid_debugtoolbar
11 11
 
12 12
 [server:main]
13  
-use = egg:pyramid#wsgiref
  13
+use = egg:waitress#main
14 14
 host = 0.0.0.0
15 15
 port = 6543
16 16
 
2  docs/narr/MyProject/production.ini
@@ -9,7 +9,7 @@ pyramid.debug_templates = false
9 9
 pyramid.default_locale_name = en
10 10
 
11 11
 [server:main]
12  
-use = egg:pyramid#wsgiref
  12
+use = egg:waitress#main
13 13
 host = 0.0.0.0
14 14
 port = 6543
15 15
 
32  docs/narr/project.rst
Source Rendered
@@ -888,33 +888,11 @@ Using an Alternate WSGI Server
888 888
 
889 889
 The code generated by :app:`Pyramid` scaffolding assumes that you will be
890 890
 using the ``pserve`` command to start your application while you do
891  
-development.  The default rendering of Pyramid scaffolding uses the *wsgiref*
892  
-WSGI server, which is a server that is ill-suited for production usage: its
893  
-main feature is that it works on all platforms and all systems, making it a
894  
-good choice as a default server from the perspective of Pyramid's developers.
895  
-
896  
-To use a server more suitable for production, you have a number of choices.
897  
-Replace the ``use = egg:pyramid#wsgref`` line in your ``production.ini`` with
898  
-one of the following.
899  
-
900  
-``use = egg:Paste#http``
901  
-
902  
-  ``paste.httpserver`` is Windows, UNIX, and Python 2 compatible.  You'll
903  
-  need to ``easy_install Paste`` into your Pyramid virtualenv for this server
904  
-  to work.
905  
-
906  
-``use = egg:pyramid#cherrypy``
907  
-
908  
-  The ``CherryPy`` WSGI server is Windows, UNIX, Python 2, and Python 3
909  
-  compatible.  You'll need to ``easy_install CherryPy`` into your Pyramid
910  
-  virtualenv for this server to work.
911  
-
912  
-The servers described above are typically both faster and more secure than
913  
-the default WSGI server used by Pyramid.  Pyramid does not depend on either
914  
-because Paste doesn't run on Python 3 (and Pyramid must) and the CherryPy
915  
-server is not distributed separately from the CherryPy web framework (and it
916  
-would be an awkward dependency to have a web framework rely on another web
917  
-framework for just its server component).
  891
+development.  The default rendering of Pyramid scaffolding uses the
  892
+*waitress* WSGI server, which is a server that is suited for production
  893
+usage.  It's not very fast, or very featureful: its main feature is that it
  894
+works on all platforms and all systems, making it a good choice as a default
  895
+server from the perspective of Pyramid's developers.
918 896
 
919 897
 ``pserve`` is by no means the only way to start up and serve a :app:`Pyramid`
920 898
 application.  As we saw in :ref:`firstapp_chapter`, ``pserve`` needn't be
4  docs/narr/startup.rst
Source Rendered
@@ -133,8 +133,8 @@ Here's a high-level time-ordered overview of what happens when you press
133 133
    far as ``pserve`` is concerned, it is "just another WSGI application".
134 134
 
135 135
 #. ``pserve`` starts the WSGI *server* defined within the ``[server:main]``
136  
-   section.  In our case, this is the ``egg:pyramid#wsgiref`` server (``use =
137  
-   egg:pyramid#wsgiref``), and it will listen on all interfaces (``host =
  136
+   section.  In our case, this is the Waitress server (``use =
  137
+   egg:waitress#main``), and it will listen on all interfaces (``host =
138 138
    0.0.0.0``), on port number 6543 (``port = 6543``).  The server code itself
139 139
    is what prints ``serving on 0.0.0.0:6543 view at http://127.0.0.1:6543``.
140 140
    The server serves the application, and the application is running, waiting
2  docs/tutorials/wiki/src/authorization/development.ini
@@ -13,7 +13,7 @@ tm.attempts = 3
13 13
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
14 14
 
15 15
 [server:main]
16  
-use = egg:pyramid#wsgiref
  16
+use = egg:waitress#main
17 17
 host = 0.0.0.0
18 18
 port = 6543
19 19
 
2  docs/tutorials/wiki/src/authorization/production.ini
@@ -12,7 +12,7 @@ tm.attempts = 3
12 12
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
13 13
 
14 14
 [server:main]
15  
-use = egg:pyramid#wsgiref
  15
+use = egg:waitress#main
16 16
 host = 0.0.0.0
17 17
 port = 6543
18 18
 
1  docs/tutorials/wiki/src/authorization/setup.py
@@ -12,6 +12,7 @@
12 12
     'pyramid_tm',
13 13
     'pyramid_debugtoolbar',
14 14
     'ZODB3',
  15
+    'waitress',
15 16
     'docutils',
16 17
     ]
17 18
 
2  docs/tutorials/wiki/src/basiclayout/development.ini
@@ -13,7 +13,7 @@ tm.attempts = 3
13 13
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
14 14
 
15 15
 [server:main]
16  
-use = egg:pyramid#wsgiref
  16
+use = egg:waitress#main
17 17
 host = 0.0.0.0
18 18
 port = 6543
19 19
 
2  docs/tutorials/wiki/src/basiclayout/production.ini
@@ -12,7 +12,7 @@ tm.attempts = 3
12 12
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
13 13
 
14 14
 [server:main]
15  
-use = egg:pyramid#wsgiref
  15
+use = egg:waitress#main
16 16
 host = 0.0.0.0
17 17
 port = 6543
18 18
 
1  docs/tutorials/wiki/src/basiclayout/setup.py
@@ -12,6 +12,7 @@
12 12
     'pyramid_tm',
13 13
     'pyramid_debugtoolbar',
14 14
     'ZODB3',
  15
+    'waitress',
15 16
     ]
16 17
 
17 18
 setup(name='tutorial',
2  docs/tutorials/wiki/src/models/development.ini
@@ -13,7 +13,7 @@ tm.attempts = 3
13 13
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
14 14
 
15 15
 [server:main]
16  
-use = egg:pyramid#wsgiref
  16
+use = egg:waitress#main
17 17
 host = 0.0.0.0
18 18
 port = 6543
19 19
 
2  docs/tutorials/wiki/src/models/production.ini
@@ -12,7 +12,7 @@ tm.attempts = 3
12 12
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
13 13
 
14 14
 [server:main]
15  
-use = egg:pyramid#wsgiref
  15
+use = egg:waitress#main
16 16
 host = 0.0.0.0
17 17
 port = 6543
18 18
 
1  docs/tutorials/wiki/src/models/setup.py
@@ -12,6 +12,7 @@
12 12
     'pyramid_tm',
13 13
     'pyramid_debugtoolbar',
14 14
     'ZODB3',
  15
+    'waitress',
15 16
     ]
16 17
 
17 18
 setup(name='tutorial',
2  docs/tutorials/wiki/src/tests/development.ini
@@ -13,7 +13,7 @@ tm.attempts = 3
13 13
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
14 14
 
15 15
 [server:main]
16  
-use = egg:pyramid#wsgiref
  16
+use = egg:waitress#main
17 17
 host = 0.0.0.0
18 18
 port = 6543
19 19
 
2  docs/tutorials/wiki/src/tests/production.ini
@@ -12,7 +12,7 @@ tm.attempts = 3
12 12
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
13 13
 
14 14
 [server:main]
15  
-use = egg:pyramid#wsgiref
  15
+use = egg:waitress#main
16 16
 host = 0.0.0.0
17 17
 port = 6543
18 18
 
1  docs/tutorials/wiki/src/tests/setup.py
@@ -12,6 +12,7 @@
12 12
     'pyramid_tm',
13 13
     'pyramid_debugtoolbar',
14 14
     'ZODB3',
  15
+    'waitress',
15 16
     'docutils',
16 17
     'WebTest', # add this
17 18
     ]
2  docs/tutorials/wiki/src/views/development.ini
@@ -13,7 +13,7 @@ tm.attempts = 3
13 13
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
14 14
 
15 15
 [server:main]
16  
-use = egg:pyramid#wsgiref
  16
+use = egg:waitress#main
17 17
 host = 0.0.0.0
18 18
 port = 6543
19 19
 
2  docs/tutorials/wiki/src/views/production.ini
@@ -12,7 +12,7 @@ tm.attempts = 3
12 12
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
13 13
 
14 14
 [server:main]
15  
-use = egg:pyramid#wsgiref
  15
+use = egg:waitress#main
16 16
 host = 0.0.0.0
17 17
 port = 6543
18 18
 
1  docs/tutorials/wiki/src/views/setup.py
@@ -12,6 +12,7 @@
12 12
     'pyramid_tm',
13 13
     'pyramid_debugtoolbar',
14 14
     'ZODB3',
  15
+    'waitress',
15 16
     'docutils',
16 17
     ]
17 18
 
2  docs/tutorials/wiki2/src/authorization/development.ini
@@ -13,7 +13,7 @@ pyramid.includes = pyramid_debugtoolbar
13 13
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
14 14
 
15 15
 [server:main]
16  
-use = egg:pyramid#wsgiref
  16
+use = egg:waitress#main
17 17
 host = 0.0.0.0
18 18
 port = 6543
19 19
 
2  docs/tutorials/wiki2/src/authorization/production.ini
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_tm
12 12
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
13 13
 
14 14
 [server:main]
15  
-use = egg:pyramid#wsgiref
  15
+use = egg:waitress#main
16 16
 host = 0.0.0.0
17 17
 port = 6543
18 18
 
1  docs/tutorials/wiki2/src/authorization/setup.py
@@ -15,6 +15,7 @@
15 15
     'pyramid_debugtoolbar',
16 16
     'zope.sqlalchemy',
17 17
     'docutils',
  18
+    'waitress',
18 19
     ]
19 20
 
20 21
 if sys.version_info[:3] < (2,5,0):
2  docs/tutorials/wiki2/src/basiclayout/development.ini
@@ -13,7 +13,7 @@ pyramid.includes = pyramid_debugtoolbar
13 13
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
14 14
 
15 15
 [server:main]
16  
-use = egg:pyramid#wsgiref
  16
+use = egg:waitress#main
17 17
 host = 0.0.0.0
18 18
 port = 6543
19 19
 
2  docs/tutorials/wiki2/src/basiclayout/production.ini
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_tm
12 12
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
13 13
 
14 14
 [server:main]
15  
-use = egg:pyramid#wsgiref
  15
+use = egg:waitress#main
16 16
 host = 0.0.0.0
17 17
 port = 6543
18 18
 
1  docs/tutorials/wiki2/src/basiclayout/setup.py
@@ -14,6 +14,7 @@
14 14
     'pyramid_tm',
15 15
     'pyramid_debugtoolbar',
16 16
     'zope.sqlalchemy',
  17
+    'waitress',
17 18
     ]
18 19
 
19 20
 if sys.version_info[:3] < (2,5,0):
2  docs/tutorials/wiki2/src/models/development.ini
@@ -13,7 +13,7 @@ pyramid.includes = pyramid_debugtoolbar
13 13
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
14 14
 
15 15
 [server:main]
16  
-use = egg:pyramid#wsgiref
  16
+use = egg:waitress#main
17 17
 host = 0.0.0.0
18 18
 port = 6543
19 19
 
2  docs/tutorials/wiki2/src/models/production.ini
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_tm
12 12
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
13 13
 
14 14
 [server:main]
15  
-use = egg:pyramid#wsgiref
  15
+use = egg:waitress#main
16 16
 host = 0.0.0.0
17 17
 port = 6543
18 18
 
1  docs/tutorials/wiki2/src/models/setup.py
@@ -14,6 +14,7 @@
14 14
     'pyramid_tm',
15 15
     'pyramid_debugtoolbar',
16 16
     'zope.sqlalchemy',
  17
+    'waitress',
17 18
     ]
18 19
 
19 20
 if sys.version_info[:3] < (2,5,0):
2  docs/tutorials/wiki2/src/tests/development.ini
@@ -13,7 +13,7 @@ pyramid.includes = pyramid_debugtoolbar
13 13
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
14 14
 
15 15
 [server:main]
16  
-use = egg:pyramid#wsgiref
  16
+use = egg:waitress#main
17 17
 host = 0.0.0.0
18 18
 port = 6543
19 19
 
2  docs/tutorials/wiki2/src/tests/production.ini
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_tm
12 12
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
13 13
 
14 14
 [server:main]
15  
-use = egg:pyramid#wsgiref
  15
+use = egg:waitress#main
16 16
 host = 0.0.0.0
17 17
 port = 6543
18 18
 
1  docs/tutorials/wiki2/src/tests/setup.py
@@ -14,6 +14,7 @@
14 14
     'pyramid_tm',
15 15
     'pyramid_debugtoolbar',
16 16
     'zope.sqlalchemy',
  17
+    'waitress',
17 18
     'docutils',
18 19
     'WebTest', # add this
19 20
     ]
2  docs/tutorials/wiki2/src/views/development.ini
@@ -13,7 +13,7 @@ pyramid.includes = pyramid_debugtoolbar
13 13
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
14 14
 
15 15
 [server:main]
16  
-use = egg:pyramid#wsgiref
  16
+use = egg:waitress#main
17 17
 host = 0.0.0.0
18 18
 port = 6543
19 19
 
2  docs/tutorials/wiki2/src/views/production.ini
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_tm
12 12
 sqlalchemy.url = sqlite:///%(here)s/tutorial.db
13 13
 
14 14
 [server:main]
15  
-use = egg:pyramid#wsgiref
  15
+use = egg:waitress#main
16 16
 host = 0.0.0.0
17 17
 port = 6543
18 18
 
1  docs/tutorials/wiki2/src/views/setup.py
@@ -14,6 +14,7 @@
14 14
     'pyramid_tm',
15 15
     'pyramid_debugtoolbar',
16 16
     'zope.sqlalchemy',
  17
+    'waitress',
17 18
     'docutils',
18 19
     ]
19 20
 
41  docs/whatsnew-1.3.rst
Source Rendered
@@ -52,7 +52,7 @@ to make some changes:
52 52
 
53 53
 - We've replaced the ``paster`` command with Pyramid-specific analogues.
54 54
 
55  
-- We've made the default WSGI server the ``wsgiref`` server.
  55
+- We've made the default WSGI server the ``waitress`` server.
56 56
 
57 57
 Previously (in Pyramid 1.0, 1.1 and 1.2), you created a Pyramid application
58 58
 using ``paster create``, like so::
@@ -85,37 +85,25 @@ Analogues of ``paster pshell``, ``paster pviews``, ``paster request`` and
85 85
 ``paster ptweens`` also exist under the respective console script names
86 86
 ``pshell``, ``pviews``, ``prequest`` and ``ptweens``.
87 87
 
88  
-We've replaced use of the Paste ``httpserver`` with the ``wsgiref`` server in
  88
+We've replaced use of the Paste ``httpserver`` with the ``waitress`` server in
89 89
 the scaffolds, so once you create a project from a scaffold, its
90 90
 ``development.ini`` and ``production.ini`` will have the following line::
91 91
 
92  
-    use = egg:pyramid#wsgiref
  92
+    use = egg:waitress#main
93 93
 
94 94
 Instead of this (which was the default in older versions)::
95 95
 
96 96
     use = egg:Paste#http
97 97
 
98  
-Using ``wsgiref`` as the default WSGI server is purely a default to make it
99  
-possible to use the same scaffolding under Python 2 and Python 3; people
100  
-running Pyramid under Python 2 can still manually install ``Paste`` and use
101  
-the Paste ``httpserver`` by replacing the former line with the latter.  This is
102  
-actually recommended if you rely on proxying from Apache or Nginx to a
103  
-``pserve`` -invoked application.  **The wsgiref server is not a production
104  
-quality server.** See :ref:`alternate_wsgi_server` for more information.
105  
-
106  
-New releases in every older major Pyramid series (1.0.2, 1.1.3, 1.2.5) also
107  
-have the ``egg:pyramid#wsgiref`` entry point, so scaffold-writers can depend
108  
-on it being there even in older major Pyramid versions.
109  
-
110 98
 .. warning::
111 99
 
112  
-   Previously, paste.httpserver "helped" by converting header values that weren't
113  
-   strings to strings. The wsgiref server, on the other hand implements the spec
114  
-   more fully. This specifically may affect you if you are modifying headers on 
115  
-   your response. The following error might be an indicator of this problem:
116  
-   **AssertionError: Header values must be strings, please check the type of
117  
-   the header being returned.** A common case would be returning unicode headers
118  
-   instead of string headers.
  100
+   Previously, paste.httpserver "helped" by converting header values that
  101
+   weren't strings to strings. The ``waitress`` server, on the other hand
  102
+   implements the spec more fully. This specifically may affect you if you
  103
+   are modifying headers on your response. The following error might be an
  104
+   indicator of this problem: **AssertionError: Header values must be
  105
+   strings, please check the type of the header being returned.** A common
  106
+   case would be returning unicode headers instead of string headers.
119 107
 
120 108
 A new :mod:`pyramid.compat` module was added which provides Python 2/3
121 109
 straddling support for Pyramid add-ons and development environments.
@@ -264,12 +252,9 @@ Backwards Incompatibilities
264 252
   Python 3.
265 253
 
266 254
 - The default WSGI server run as the result of ``pserve`` from newly rendered
267  
-  scaffolding is now the ``wsgiref`` WSGI server instead of the
268  
-  ``paste.httpserver`` server.  ``wsgiref``, unlike the server it replaced
269  
-  (``paste.httpserver``) is not a production quality server.  See
270  
-  :ref:`alternate_wsgi_server` for information about how to use another WSGI
271  
-  server in production. Rationale: the Paste and PasteScript packages do not
272  
-  run under Python 3.
  255
+  scaffolding is now the ``waitress`` WSGI server instead of the
  256
+  ``paste.httpserver`` server.  Rationale: the Paste and PasteScript packages
  257
+  do not run under Python 3.
273 258
 
274 259
 - The ``pshell`` command (see "paster pshell") no longer accepts a
275 260
   ``--disable-ipython`` command-line argument.  Instead, it accepts a ``-p``
2  pyramid/scaffolds/alchemy/development.ini_tmpl
@@ -13,7 +13,7 @@ pyramid.includes = pyramid_debugtoolbar
13 13
 sqlalchemy.url = sqlite:///%(here)s/{{project}}.db
14 14
 
15 15
 [server:main]
16  
-use = egg:pyramid#wsgiref
  16
+use = egg:waitress#main
17 17
 host = 0.0.0.0
18 18
 port = 6543
19 19
 
2  pyramid/scaffolds/alchemy/production.ini_tmpl
@@ -12,7 +12,7 @@ pyramid.includes = pyramid_tm
12 12
 sqlalchemy.url = sqlite:///%(here)s/{{project}}.db
13 13
 
14 14
 [server:main]
15  
-use = egg:pyramid#wsgiref
  15
+use = egg:waitress#main
16 16
 host = 0.0.0.0
17 17
 port = 6543
18 18
 
1  pyramid/scaffolds/alchemy/setup.py_tmpl
@@ -14,6 +14,7 @@ requires = [
14 14
     'pyramid_tm',
15 15
     'pyramid_debugtoolbar',
16 16
     'zope.sqlalchemy',
  17
+    'waitress',
17 18
     ]
18 19
 
19 20
 if sys.version_info[:3] < (2,5,0):
2  pyramid/scaffolds/starter/development.ini_tmpl
@@ -10,7 +10,7 @@ pyramid.default_locale_name = en
10 10
 pyramid.includes = pyramid_debugtoolbar
11 11
 
12 12
 [server:main]
13  
-use = egg:pyramid#wsgiref
  13
+use = egg:waitress#main
14 14
 host = 0.0.0.0
15 15
 port = 6543
16 16
 
2  pyramid/scaffolds/starter/production.ini_tmpl
@@ -9,7 +9,7 @@ pyramid.debug_templates = false
9 9
 pyramid.default_locale_name = en
10 10
 
11 11
 [server:main]
12  
-use = egg:pyramid#wsgiref
  12
+use = egg:waitress#main
13 13
 host = 0.0.0.0
14 14
 port = 6543
15 15
 
6  pyramid/scaffolds/starter/setup.py_tmpl
@@ -6,7 +6,11 @@ here = os.path.abspath(os.path.dirname(__file__))
6 6
 README = open(os.path.join(here, 'README.txt')).read()
7 7
 CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
8 8
 
9  
-requires = ['pyramid', 'pyramid_debugtoolbar']
  9
+requires = [
  10
+    'pyramid',
  11
+    'pyramid_debugtoolbar',
  12
+    'waitress',
  13
+    ]
10 14
 
11 15
 setup(name='{{project}}',
12 16
       version='0.0',
2  pyramid/scaffolds/zodb/development.ini_tmpl
@@ -14,7 +14,7 @@ tm.attempts = 3
14 14
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
15 15
 
16 16
 [server:main]
17  
-use = egg:pyramid#wsgiref
  17
+use = egg:waitress#main
18 18
 host = 0.0.0.0
19 19
 port = 6543
20 20
 
2  pyramid/scaffolds/zodb/production.ini_tmpl
@@ -13,7 +13,7 @@ tm.attempts = 3
13 13
 zodbconn.uri = file://%(here)s/Data.fs?connection_cache_size=20000
14 14
 
15 15
 [server:main]
16  
-use = egg:pyramid#wsgiref
  16
+use = egg:waitress#main
17 17
 host = 0.0.0.0
18 18
 port = 6543
19 19
 
1  pyramid/scaffolds/zodb/setup.py_tmpl
@@ -12,6 +12,7 @@ requires = [
12 12
     'pyramid_tm',
13 13
     'pyramid_debugtoolbar',
14 14
     'ZODB3',
  15
+    'waitress',
15 16
     ]
16 17
 
17 18
 setup(name='{{project}}',

0 notes on commit 030d106

Please sign in to comment.
Something went wrong with that request. Please try again.