GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — bpo-36345: Include the code from Tools/scripts/serve.py for the wsgiref-base web server example by matrixise · Pull Request #12562 · python/cpython

bpo-36345: Include the code from Tools/scripts/serve.py for the wsgiref-base web server example #12562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matrixise merged 7 commits into python:master from matrixise:bpo-36345-part-3
Apr 16, 2019

Uh oh!

There was an error while loading. Please reload this page.
Merged

bpo-36345: Include the code from Tools/scripts/serve.py for the wsgiref-base web server example #12562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
756332d
bpo-36345: Include the code from Tools/scripts/serve.py for the wsgir…
matrixise Mar 26, 2019
74fd34c
Fix the blurb entry
matrixise Mar 26, 2019
c938813
Example of a WSGI application serving the current directory, accept
matrixise Apr 15, 2019
a3dbd35
Update the description of the example
matrixise Apr 15, 2019
530ed32
Add the default port in the doc
matrixise Apr 15, 2019
2b1fa72
Close the resources for the httpd server
matrixise Apr 15, 2019
a7db659
Remove \b\b for the portability
matrixise Apr 15, 2019
File filter
Filter by extension
Clear filters
Conversations
Failed to load comments.
Loading

Uh oh!

There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading

Uh oh!

There was an error while loading. Please reload this page.
Diff view
Diff view

There are no files selected for viewing

34 changes: 4 additions & 30 deletions 34 Doc/library/wsgiref.rst
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -783,33 +783,7 @@ This is a working "Hello World" WSGI application::
httpd.serve_forever()


Example of a small wsgiref-based web server::

# Takes a path to serve from and an optional port number (defaults to 8000),
# then tries to serve files. Mime types are guessed from the file names, 404
# errors are raised if the file is not found.
import sys
import os
import mimetypes
from wsgiref import simple_server, util

def app(environ, respond):
fn = os.path.join(path, environ['PATH_INFO'][1:])
if '.' not in fn.split(os.path.sep)[-1]:
fn = os.path.join(fn, 'index.html')
type = mimetypes.guess_type(fn)[0]

if os.path.exists(fn):
respond('200 OK', [('Content-Type', type)])
return util.FileWrapper(open(fn, "rb"))
else:
respond('404 Not Found', [('Content-Type', 'text/plain')])
return [b'not found']

path = sys.argv[1]
port = int(sys.argv[2]) if len(sys.argv) > 2 else 8000
with simple_server.make_server('', port, app) as httpd:
print("Serving {} on port {}, control-C to stop".format(path, port))

# Serve until process is killed
httpd.serve_forever()
Example of a WSGI application serving the current directory, accept optional
directory and port number (default: 8000) on the command line:

.. literalinclude:: ../../Tools/scripts/serve.py
3 changes: 3 additions & 0 deletions 3 Misc/NEWS.d/next/Documentation/2019-03-26-14-58-34.bpo-36345.r2stx3.rst
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Avoid the duplication of code from ``Tools/scripts/serve.py`` in using the
:rst:dir:`literalinclude` directive for the basic wsgiref-based web server in the
documentation of :mod:`wsgiref`. Contributed by Stéphane Wirtel.
5 changes: 3 additions & 2 deletions 5 Tools/scripts/serve.py
Show comments
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ def app(environ, respond):
return [b'not found']

if __name__ == '__main__':
path = sys.argv[1]
path = sys.argv[1] if len(sys.argv) > 1 else os.getcwd()
port = int(sys.argv[2]) if len(sys.argv) > 2 else 8000
httpd = simple_server.make_server('', port, app)
print("Serving {} on port {}, control-C to stop".format(path, port))
Comment thread

@vstinner vstinner Apr 15, 2019

Copy link
Copy Markdown
Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I press CTRL+C, I get a ResourceWarning. Please add httpd.server_close() after print("\b\bShutting down."). By the way, I'm not sure that "\b" is supported on Windows. I suggest to remove ""\b\b" to make the script more portable.

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions

@matrixise matrixise Apr 15, 2019

Copy link
Copy Markdown
Member Author

There was a problem hiding this comment.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
try:
httpd.serve_forever()
except KeyboardInterrupt:
print("\b\bShutting down.")
print("Shutting down.")
httpd.server_close()
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.