From 86ef95d3fbd121fec1168b87ddfe027273b38cea Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 27 Nov 2014 23:45:37 +0200 Subject: [PATCH] Issue #18905: "pydoc -p 0" now outputs actually used port. Based on patch by Wieland Hoffmann. --- Lib/pydoc.py | 8 +++++--- Misc/NEWS | 6 ++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Lib/pydoc.py b/Lib/pydoc.py index dfa1f8e36b..594e6c789e 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -17,7 +17,8 @@ Run "pydoc -k " to search for a keyword in the synopsis lines of all available modules. Run "pydoc -p " to start an HTTP server on a given port on the -local machine to generate documentation web pages. +local machine to generate documentation web pages. Port number 0 can be +used to get an arbitrary unused port. For platforms without a command line, "pydoc -g" starts the HTTP server and also pops up a little window for controlling it. @@ -2098,7 +2099,6 @@ pydoc by Ka-Ping Yee <ping@lfw.org>''' def __init__(self, port, callback): host = 'localhost' self.address = (host, port) - self.url = 'http://%s:%d/' % (host, port) self.callback = callback self.base.__init__(self, self.address, self.handler) @@ -2111,6 +2111,7 @@ pydoc by Ka-Ping Yee <ping@lfw.org>''' def server_activate(self): self.base.server_activate(self) + self.url = 'http://%s:%d/' % (self.address[0], self.server_port) if self.callback: self.callback(self) DocServer.base = BaseHTTPServer.HTTPServer @@ -2384,7 +2385,8 @@ def cli(): Search for a keyword in the synopsis lines of all available modules. %s -p - Start an HTTP server on the given port on the local machine. + Start an HTTP server on the given port on the local machine. Port + number 0 can be used to get an arbitrary unused port. %s -g Pop up a graphical interface for finding and serving documentation. diff --git a/Misc/NEWS b/Misc/NEWS index b630250258..d3bf2dedc9 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -22,6 +22,12 @@ Documentation - Issue #21514: The documentation of the json module now refers to new JSON RFC 7159 instead of obsoleted RFC 4627. +Tools/Demos +----------- + +- Issue #18905: "pydoc -p 0" now outputs actually used port. Based on patch by + Wieland Hoffmann. + What's New in Python 2.7.9 release candidate 1? =============================================== -- 2.50.1