From afde3fc32a3868b08c54f45711352e5f74fdbc97 Mon Sep 17 00:00:00 2001 From: Sanyam Khurana Date: Sat, 2 Dec 2017 17:03:17 +0530 Subject: [PATCH 1/3] bpo-25910: Fixes redirection from http to https --- Doc/bugs.rst | 2 +- Doc/faq/design.rst | 2 +- Doc/faq/gui.rst | 14 +++++++------- Doc/faq/library.rst | 2 +- Doc/faq/programming.rst | 2 +- Doc/faq/windows.rst | 4 ++-- Doc/glossary.rst | 2 +- Doc/howto/curses.rst | 2 +- Doc/howto/pyporting.rst | 2 +- Doc/howto/unicode.rst | 4 ++-- Doc/library/email.generator.rst | 4 ++-- Doc/library/hashlib.rst | 4 ++-- Doc/library/othergui.rst | 6 +++--- Doc/library/secrets.rst | 4 ++-- Doc/library/select.rst | 2 +- Doc/library/sqlite3.rst | 2 +- Doc/library/ssl.rst | 2 +- Doc/library/tkinter.rst | 4 ++-- Doc/library/unittest.rst | 2 +- Doc/tutorial/interactive.rst | 2 +- Doc/using/mac.rst | 2 +- Doc/using/windows.rst | 14 +++++++------- Doc/whatsnew/2.7.rst | 6 +++--- Doc/whatsnew/3.6.rst | 4 ++-- 24 files changed, 47 insertions(+), 47 deletions(-) diff --git a/Doc/bugs.rst b/Doc/bugs.rst index 1b0a5a9a9377cb..739bd2fc8c39ce 100644 --- a/Doc/bugs.rst +++ b/Doc/bugs.rst @@ -68,7 +68,7 @@ taken on the bug. .. seealso:: - `How to Report Bugs Effectively `_ + `How to Report Bugs Effectively `_ Article which goes into some detail about how to create a useful bug report. This describes what kind of information is useful and why it is useful. diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst index 1bd800b1a81bab..2e56fbc2f425ec 100644 --- a/Doc/faq/design.rst +++ b/Doc/faq/design.rst @@ -343,7 +343,7 @@ each Python stack frame. Also, extensions can call back into Python at almost random moments. Therefore, a complete threads implementation requires thread support for C. -Answer 2: Fortunately, there is `Stackless Python `_, +Answer 2: Fortunately, there is `Stackless Python `_, which has a completely redesigned interpreter loop that avoids the C stack. diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst index 477d8c633438d1..4a4de60d4ada8c 100644 --- a/Doc/faq/gui.rst +++ b/Doc/faq/gui.rst @@ -43,11 +43,11 @@ number of platforms, with Windows, Mac OS X, GTK, X11, all listed as current stable targets. Language bindings are available for a number of languages including Python, Perl, Ruby, etc. -wxPython (http://www.wxpython.org) is the Python binding for -wxwidgets. While it often lags slightly behind the official wxWidgets -releases, it also offers a number of features via pure Python -extensions that are not available in other language bindings. There -is an active wxPython user and developer community. +wxPython (https://www.wxpython.org) is the Python binding for wxwidgets. +While it often lags slightly behind the official wxWidgets releases, it also +offers a number of features via pure Python extensions that are not +available in other language bindings. There is an active wxPython user and +developer community. Both wxWidgets and wxPython are free, open source, software with permissive licences that allow their use in commercial products as @@ -72,9 +72,9 @@ Gtk+ The `GObject introspection bindings `_ for Python allow you to write GTK+ 3 applications. There is also a -`Python GTK+ 3 Tutorial `_. +`Python GTK+ 3 Tutorial `_. -The older PyGtk bindings for the `Gtk+ 2 toolkit `_ have +The older PyGtk bindings for the `Gtk+ 2 toolkit `_ have been implemented by James Henstridge; see . Kivy diff --git a/Doc/faq/library.rst b/Doc/faq/library.rst index b5fdfa42cdb082..f84feadd780234 100644 --- a/Doc/faq/library.rst +++ b/Doc/faq/library.rst @@ -419,7 +419,7 @@ Python program effectively only uses one CPU, due to the insistence that Back in the days of Python 1.5, Greg Stein actually implemented a comprehensive patch set (the "free threading" patches) that removed the GIL and replaced it with fine-grained locking. Adam Olsen recently did a similar experiment -in his `python-safethread `_ +in his `python-safethread `_ project. Unfortunately, both experiments exhibited a sharp drop in single-thread performance (at least 30% slower), due to the amount of fine-grained locking necessary to compensate for the removal of the GIL. diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst index d9bdb21e79ac66..e53d1516eba74f 100644 --- a/Doc/faq/programming.rst +++ b/Doc/faq/programming.rst @@ -100,7 +100,7 @@ which don't. One is Thomas Heller's py2exe (Windows only) at http://www.py2exe.org/ -Another tool is Anthony Tuininga's `cx_Freeze `_. +Another tool is Anthony Tuininga's `cx_Freeze `_. Are there coding standards or a style guide for Python programs? diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst index 6ac83e45d2e815..af7ffc55025e16 100644 --- a/Doc/faq/windows.rst +++ b/Doc/faq/windows.rst @@ -170,8 +170,8 @@ offender. How do I make an executable from a Python script? ------------------------------------------------- -See http://cx-freeze.sourceforge.net/ for a distutils extension that allows you -to create console and GUI executables from Python code. +See https://anthony-tuininga.github.io/cx_Freeze/ for a distutils extension +that allows you to create console and GUI executables from Python code. `py2exe `_, the most popular extension for building Python 2.x-based executables, does not yet support Python 3 but a version that does is in development. diff --git a/Doc/glossary.rst b/Doc/glossary.rst index dba9186d935a6a..c4468a3943d4ec 100644 --- a/Doc/glossary.rst +++ b/Doc/glossary.rst @@ -126,7 +126,7 @@ Glossary BDFL Benevolent Dictator For Life, a.k.a. `Guido van Rossum - `_, Python's creator. + `_, Python's creator. binary file A :term:`file object` able to read and write diff --git a/Doc/howto/curses.rst b/Doc/howto/curses.rst index 188a5cf2231b87..c1feee5e30080d 100644 --- a/Doc/howto/curses.rst +++ b/Doc/howto/curses.rst @@ -543,7 +543,7 @@ learn more about submitting patches to Python. * `Writing Programs with NCURSES `_: a lengthy tutorial for C programmers. -* `The ncurses man page `_ +* `The ncurses man page `_ * `The ncurses FAQ `_ * `"Use curses... don't swear" `_: video of a PyCon 2013 talk on controlling terminals using curses or Urwid. diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst index 8562d2373749f0..bec6a3d72ce548 100644 --- a/Doc/howto/pyporting.rst +++ b/Doc/howto/pyporting.rst @@ -449,4 +449,4 @@ to make sure everything functions as expected in both versions of Python. .. _"What's New": https://docs.python.org/3/whatsnew/index.html -.. _Why Python 3 exists: http://www.snarky.ca/why-python-3-exists +.. _Why Python 3 exists: https://snarky.ca/why-python-3-exists diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst index 9649b9c609c255..a83e5a21895c2a 100644 --- a/Doc/howto/unicode.rst +++ b/Doc/howto/unicode.rst @@ -217,7 +217,7 @@ To help understand the standard, Jukka Korpela has written `an introductory guide `_ to reading the Unicode character tables. -Another `good introductory article `_ +Another `good introductory article `_ was written by Joel Spolsky. If this introduction didn't make things clear to you, you should try reading this alternate article before continuing. @@ -487,7 +487,7 @@ References Some good alternative discussions of Python's Unicode support are: * `Processing Text Files in Python 3 `_, by Nick Coghlan. -* `Pragmatic Unicode `_, a PyCon 2012 presentation by Ned Batchelder. +* `Pragmatic Unicode `_, a PyCon 2012 presentation by Ned Batchelder. The :class:`str` type is described in the Python library reference at :ref:`textseq`. diff --git a/Doc/library/email.generator.rst b/Doc/library/email.generator.rst index 1e64e1066c7da5..cc8e8225a203ab 100644 --- a/Doc/library/email.generator.rst +++ b/Doc/library/email.generator.rst @@ -53,7 +53,7 @@ over channels that are not "8 bit clean". :data:`~email.policy.compat32` policy and ``False`` for all others). *mangle_from_* is intended for use when messages are stored in unix mbox format (see :mod:`mailbox` and `WHY THE CONTENT-LENGTH FORMAT IS BAD - `_). + `_). If *maxheaderlen* is not ``None``, refold any header lines that are longer than *maxheaderlen*, or if ``0``, do not rewrap any headers. If @@ -154,7 +154,7 @@ to be using :class:`BytesGenerator`, and not :class:`Generator`. :data:`~email.policy.compat32` policy and ``False`` for all others). *mangle_from_* is intended for use when messages are stored in unix mbox format (see :mod:`mailbox` and `WHY THE CONTENT-LENGTH FORMAT IS BAD - `_). + `_). If *maxheaderlen* is not ``None``, refold any header lines that are longer than *maxheaderlen*, or if ``0``, do not rewrap any headers. If diff --git a/Doc/library/hashlib.rst b/Doc/library/hashlib.rst index 9d563566d49d7f..d789884f6d6e6f 100644 --- a/Doc/library/hashlib.rst +++ b/Doc/library/hashlib.rst @@ -482,7 +482,7 @@ Keyed hashing Keyed hashing can be used for authentication as a faster and simpler replacement for `Hash-based message authentication code -`_ (HMAC). +`_ (HMAC). BLAKE2 can be securely used in prefix-MAC mode thanks to the indifferentiability property inherited from BLAKE. @@ -694,7 +694,7 @@ implementation, extension code, and this documentation: You should have received a copy of the CC0 Public Domain Dedication along with this software. If not, see - http://creativecommons.org/publicdomain/zero/1.0/. + https://creativecommons.org/publicdomain/zero/1.0/. The following people have helped with development or contributed their changes to the project and the public domain according to the Creative Commons Public diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst index d40abe167653b7..4548459f8e261d 100644 --- a/Doc/library/othergui.rst +++ b/Doc/library/othergui.rst @@ -11,9 +11,9 @@ available for Python: `PyGObject `_ PyGObject provides introspection bindings for C libraries using `GObject `_. One of - these libraries is the `GTK+ 3 `_ widget set. + these libraries is the `GTK+ 3 `_ widget set. GTK+ comes with many more widgets than Tkinter provides. An online - `Python GTK+ 3 Tutorial `_ + `Python GTK+ 3 Tutorial `_ is available. `PyGTK `_ @@ -35,7 +35,7 @@ available for Python: Compared to PyQt, its licensing scheme is friendlier to non-open source applications. - `wxPython `_ + `wxPython `_ wxPython is a cross-platform GUI toolkit for Python that is built around the popular `wxWidgets `_ (formerly wxWindows) C++ toolkit. It provides a native look and feel for applications on diff --git a/Doc/library/secrets.rst b/Doc/library/secrets.rst index 9bf848f9114359..28ce472c7e7e16 100644 --- a/Doc/library/secrets.rst +++ b/Doc/library/secrets.rst @@ -130,7 +130,7 @@ Other functions Return ``True`` if strings *a* and *b* are equal, otherwise ``False``, in such a way as to reduce the risk of - `timing attacks `_. + `timing attacks `_. See :func:`hmac.compare_digest` for additional details. @@ -173,7 +173,7 @@ three digits: break -Generate an `XKCD-style passphrase `_: +Generate an `XKCD-style passphrase `_: .. testcode:: diff --git a/Doc/library/select.rst b/Doc/library/select.rst index bd5442c6a27aa0..e252e7adb9246a 100644 --- a/Doc/library/select.rst +++ b/Doc/library/select.rst @@ -264,7 +264,7 @@ object. Edge and Level Trigger Polling (epoll) Objects ---------------------------------------------- - http://linux.die.net/man/4/epoll + https://linux.die.net/man/4/epoll *eventmask* diff --git a/Doc/library/sqlite3.rst b/Doc/library/sqlite3.rst index 9fef7d7f03f1f0..20e65347d4d33c 100644 --- a/Doc/library/sqlite3.rst +++ b/Doc/library/sqlite3.rst @@ -107,7 +107,7 @@ This example uses the iterator form:: The SQLite web page; the documentation describes the syntax and the available data types for the supported SQL dialect. - http://www.w3schools.com/sql/ + https://www.w3schools.com/sql/ Tutorial, reference and examples for learning SQL syntax. :pep:`249` - Database API Specification 2.0 diff --git a/Doc/library/ssl.rst b/Doc/library/ssl.rst index 6deaded0d6effd..4ecdbeb660bb2e 100644 --- a/Doc/library/ssl.rst +++ b/Doc/library/ssl.rst @@ -1546,7 +1546,7 @@ to speed up repeated connections from the same clients. .. versionadded:: 3.3 .. seealso:: - `SSL/TLS & Perfect Forward Secrecy `_ + `SSL/TLS & Perfect Forward Secrecy `_ Vincent Bernat. .. method:: SSLContext.wrap_socket(sock, server_side=False, \ diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst index 3e1faed8c7b8d5..35e7a5fb90567a 100644 --- a/Doc/library/tkinter.rst +++ b/Doc/library/tkinter.rst @@ -38,7 +38,7 @@ this should open a window demonstrating a simple Tk interface. `Programming Python `_ Book by Mark Lutz, has excellent coverage of Tkinter. - `Modern Tkinter for Busy Python Developers `_ + `Modern Tkinter for Busy Python Developers `_ Book by Mark Rozerman about building attractive and modern graphical user interfaces with Python and Tkinter. `Python and Tkinter Programming `_ @@ -183,7 +183,7 @@ documentation that exists. Here are some hints: `ActiveState Tcl Home Page `_ The Tk/Tcl development is largely taking place at ActiveState. - `Tcl and the Tk Toolkit `_ + `Tcl and the Tk Toolkit `_ The book by John Ousterhout, the inventor of Tcl. `Practical Programming in Tcl and Tk `_ diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index 92e567d12824fa..26d71182628b8b 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -56,7 +56,7 @@ test runner Kent Beck's original paper on testing frameworks using the pattern shared by :mod:`unittest`. - `Nose `_ and `py.test `_ + `Nose `_ and `py.test `_ Third-party unittest frameworks with a lighter-weight syntax for writing tests. For example, ``assert func(10) == 42``. diff --git a/Doc/tutorial/interactive.rst b/Doc/tutorial/interactive.rst index d73cfeb34f1946..c0eb1feec4eb4d 100644 --- a/Doc/tutorial/interactive.rst +++ b/Doc/tutorial/interactive.rst @@ -51,4 +51,4 @@ bpython_. .. _GNU Readline: https://tiswww.case.edu/php/chet/readline/rltop.html .. _IPython: https://ipython.org/ -.. _bpython: http://www.bpython-interpreter.org/ +.. _bpython: https://www.bpython-interpreter.org/ diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst index 8f1ac3f3fd3a97..b89c98709ea379 100644 --- a/Doc/using/mac.rst +++ b/Doc/using/mac.rst @@ -149,7 +149,7 @@ X by Apple, and the latest version can be downloaded and installed from https://www.activestate.com; it can also be built from source. *wxPython* is another popular cross-platform GUI toolkit that runs natively on -Mac OS X. Packages and documentation are available from http://www.wxpython.org. +Mac OS X. Packages and documentation are available from https://www.wxpython.org. *PyQt* is another popular cross-platform GUI toolkit that runs natively on Mac OS X. More information can be found at diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index 68687e9f3ec367..a2a9789ea119f8 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -291,9 +291,9 @@ for detailed information about platforms with pre-compiled installers. by Mark Pilgrim, 2004, ISBN 1-59059-356-1 - `For Windows users `_ + `For Windows users `_ in "Installing Python" - in "`A Byte of Python `_" + in "`A Byte of Python `_" by Swaroop C H, 2003 @@ -871,11 +871,11 @@ shipped with PyWin32. It is an embeddable IDE with a built-in debugger. cx_Freeze --------- -`cx_Freeze `_ is a :mod:`distutils` -extension (see :ref:`extending-distutils`) which wraps Python scripts into -executable Windows programs (:file:`{*}.exe` files). When you have done this, -you can distribute your application without requiring your users to install -Python. +`cx_Freeze `_ is a +:mod:`distutils` extension (see :ref:`extending-distutils`) which wraps +Python scripts into executable Windows programs (:file:`{*}.exe` files). +When you have done this, you can distribute your application without +requiring your users to install Python. WConio diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst index 55392fc2be0872..765d424a9b59cf 100644 --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -1809,7 +1809,7 @@ wish to read the Tcl/Tk manual page describing the Ttk theme engine, available at https://www.tcl.tk/man/tcl8.5/TkCmd/ttk_intro.htm. Some screenshots of the Python/Ttk code in use are at -http://code.google.com/p/python-ttk/wiki/Screenshots. +https://code.google.com/archive/p/python-ttk/wikis/Screenshots.wiki. The :mod:`ttk` module was written by Guilherme Polo and added in :issue:`2983`. An alternate version called ``Tile.py``, written by @@ -1832,8 +1832,8 @@ https://pypi.python.org/pypi/unittest2. When used from the command line, the module can automatically discover tests. It's not as fancy as `py.test `__ or -`nose `__, but provides a simple way -to run tests kept within a set of package directories. For example, +`nose `__, but provides a +simple way to run tests kept within a set of package directories. For example, the following command will search the :file:`test/` subdirectory for any importable test files named ``test*.py``:: diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst index 60469cd1d36519..62f6e63429f155 100644 --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -238,8 +238,8 @@ and the ``__annotations__`` attribute. and Guido van Rossum. Implemented by Ivan Levkivskyi. Tools that use or will use the new syntax: - `mypy `_, - `pytype `_, PyCharm, etc. + `mypy `_, + `pytype `_, PyCharm, etc. .. _whatsnew36-pep515: From 269200745111cd8b5a055f5a8de0458c2e7831c1 Mon Sep 17 00:00:00 2001 From: Sanyam Khurana Date: Mon, 4 Dec 2017 23:36:14 +0530 Subject: [PATCH 2/3] Address review comments --- Doc/faq/gui.rst | 10 +++++----- Doc/faq/windows.rst | 2 +- Doc/using/windows.rst | 10 +++++----- Doc/whatsnew/3.6.rst | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Doc/faq/gui.rst b/Doc/faq/gui.rst index 4a4de60d4ada8c..9e15ace99e238f 100644 --- a/Doc/faq/gui.rst +++ b/Doc/faq/gui.rst @@ -43,11 +43,11 @@ number of platforms, with Windows, Mac OS X, GTK, X11, all listed as current stable targets. Language bindings are available for a number of languages including Python, Perl, Ruby, etc. -wxPython (https://www.wxpython.org) is the Python binding for wxwidgets. -While it often lags slightly behind the official wxWidgets releases, it also -offers a number of features via pure Python extensions that are not -available in other language bindings. There is an active wxPython user and -developer community. +`wxPython `_ is the Python binding for +wxwidgets. While it often lags slightly behind the official wxWidgets +releases, it also offers a number of features via pure Python +extensions that are not available in other language bindings. There +is an active wxPython user and developer community. Both wxWidgets and wxPython are free, open source, software with permissive licences that allow their use in commercial products as diff --git a/Doc/faq/windows.rst b/Doc/faq/windows.rst index af7ffc55025e16..d703f2862221a6 100644 --- a/Doc/faq/windows.rst +++ b/Doc/faq/windows.rst @@ -170,7 +170,7 @@ offender. How do I make an executable from a Python script? ------------------------------------------------- -See https://anthony-tuininga.github.io/cx_Freeze/ for a distutils extension +See `cx_Freeze `_ for a distutils extension that allows you to create console and GUI executables from Python code. `py2exe `_, the most popular extension for building Python 2.x-based executables, does not yet support Python 3 but a version that diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst index a2a9789ea119f8..b5a822b63d28da 100644 --- a/Doc/using/windows.rst +++ b/Doc/using/windows.rst @@ -871,11 +871,11 @@ shipped with PyWin32. It is an embeddable IDE with a built-in debugger. cx_Freeze --------- -`cx_Freeze `_ is a -:mod:`distutils` extension (see :ref:`extending-distutils`) which wraps -Python scripts into executable Windows programs (:file:`{*}.exe` files). -When you have done this, you can distribute your application without -requiring your users to install Python. +`cx_Freeze `_ is a :mod:`distutils` +extension (see :ref:`extending-distutils`) which wraps Python scripts into +executable Windows programs (:file:`{*}.exe` files). When you have done this, +you can distribute your application without requiring your users to install +Python. WConio diff --git a/Doc/whatsnew/3.6.rst b/Doc/whatsnew/3.6.rst index 62f6e63429f155..67c86df02076bb 100644 --- a/Doc/whatsnew/3.6.rst +++ b/Doc/whatsnew/3.6.rst @@ -238,7 +238,7 @@ and the ``__annotations__`` attribute. and Guido van Rossum. Implemented by Ivan Levkivskyi. Tools that use or will use the new syntax: - `mypy `_, + `mypy `_, `pytype `_, PyCharm, etc. From 46ba6712ccacd88c47b30ec1b21331b9d2182bde Mon Sep 17 00:00:00 2001 From: Sanyam Khurana Date: Mon, 4 Dec 2017 23:41:49 +0530 Subject: [PATCH 3/3] Fixes link to nose.readthedocs.io --- Doc/whatsnew/2.7.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst index 765d424a9b59cf..eec8984539573c 100644 --- a/Doc/whatsnew/2.7.rst +++ b/Doc/whatsnew/2.7.rst @@ -1832,7 +1832,7 @@ https://pypi.python.org/pypi/unittest2. When used from the command line, the module can automatically discover tests. It's not as fancy as `py.test `__ or -`nose `__, but provides a +`nose `__, but provides a simple way to run tests kept within a set of package directories. For example, the following command will search the :file:`test/` subdirectory for any importable test files named ``test*.py``::