Changeset 391 for python/trunk/Doc/library/simplehttpserver.rst

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Doc/library/simplehttpserver.rst (modified) (2 diffs)

python/trunk/Doc/library/simplehttpserver.rst

@@ -9 +9 @@
 .. note::
    The :mod:`SimpleHTTPServer` module has been merged into :mod:`http.server` in
-   Python 3.0.  The :term:`2to3` tool will automatically adapt imports when
-   converting your sources to 3.0.
+   Python 3.  The :term:`2to3` tool will automatically adapt imports when
+   converting your sources to Python 3.
 
 
@@ -82 +82 @@
       ``text/`` the file is opened in text mode; otherwise binary mode is used.
 
-      For example usage, see the implementation of the :func:`test` function.
+      The :func:`test` function in the :mod:`SimpleHTTPServer` module is an
+      example which creates a server using the :class:`SimpleHTTPRequestHandler`
+      as the Handler.
 
       .. versionadded:: 2.5
          The ``'Last-Modified'`` header.
 
+
+The :mod:`SimpleHTTPServer` module can be used in the following manner in order
+to set up a very basic web server serving files relative to the current
+directory. ::
+
+   import SimpleHTTPServer
+   import SocketServer
+
+   PORT = 8000
+
+   Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
+
+   httpd = SocketServer.TCPServer(("", PORT), Handler)
+
+   print "serving at port", PORT
+   httpd.serve_forever()
+
+The :mod:`SimpleHTTPServer` module can also be invoked directly using the
+:option:`-m` switch of the interpreter with a ``port number`` argument.
+Similar to the previous example, this serves the files relative to the
+current directory. ::
+
+   python -m SimpleHTTPServer 8000
 
 .. seealso::