42d74be742
* Tue Feb 19 2013 David Malcolm <dmalcolm@redhat.com> - 2.7.3-17 - remove "_default_patch_fuzz" directive to avoid patches being silently misapplied (refresh patch 1, patch 101, patch 102, patch 111, patch 121, patch 158; rename patch 1, patch 101, patch 121; apply patch 54 before the lib64 patches to avoid fuzz problems caused by the conditional application of the lib64 patches)
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
diff -up Python-2.7.3/Lib/pydoc.py.no_gui Python-2.7.3/Lib/pydoc.py
|
|
--- Python-2.7.3/Lib/pydoc.py.no_gui 2012-04-09 19:07:31.000000000 -0400
|
|
+++ Python-2.7.3/Lib/pydoc.py 2013-02-19 13:48:44.480054515 -0500
|
|
@@ -19,9 +19,6 @@ of all available modules.
|
|
Run "pydoc -p <port>" to start an HTTP server on a given port on the
|
|
local machine to generate documentation web pages.
|
|
|
|
-For platforms without a command line, "pydoc -g" starts the HTTP server
|
|
-and also pops up a little window for controlling it.
|
|
-
|
|
Run "pydoc -w <name>" to write out the HTML documentation for a module
|
|
to a file named "<name>.html".
|
|
|
|
@@ -2290,9 +2287,6 @@ def cli():
|
|
writing = 0
|
|
|
|
for opt, val in opts:
|
|
- if opt == '-g':
|
|
- gui()
|
|
- return
|
|
if opt == '-k':
|
|
apropos(val)
|
|
return
|
|
@@ -2346,13 +2340,10 @@ def cli():
|
|
%s -p <port>
|
|
Start an HTTP server on the given port on the local machine.
|
|
|
|
-%s -g
|
|
- Pop up a graphical interface for finding and serving documentation.
|
|
-
|
|
%s -w <name> ...
|
|
Write out the HTML documentation for a module to a file in the current
|
|
directory. If <name> contains a '%s', it is treated as a filename; if
|
|
it names a directory, documentation is written for all the contents.
|
|
-""" % (cmd, os.sep, cmd, cmd, cmd, cmd, os.sep)
|
|
+""" % (cmd, os.sep, cmd, cmd, cmd, os.sep)
|
|
|
|
if __name__ == '__main__': cli()
|