Use https:// URLs when referring to python.org hosts.

diff --git a/Doc/bugs.rst b/Doc/bugs.rst
index 4e83d4d61dac7ae96542c59ba8bef526cc74f87f..11e6101b8238f8f987ab389cc36ab738e943a784 100644 (file)
--- a/Doc/bugs.rst
+++ b/Doc/bugs.rst
@@ -82,6 +82,6 @@ patching Python in the `Python Developer's Guide`_.  If you have questions,
 the `core-mentorship mailing list`_ is a friendly place to get answers to
 any and all questions pertaining to the process of fixing issues in Python.
 
-.. _Documentation bugs: http://bugs.python.org/issue?@filter=status&@filter=components&components=4&status=1&@columns=id,activity,title,status&@sort=-activity
-.. _Python Developer's Guide: http://docs.python.org/devguide/
+.. _Documentation bugs: https://bugs.python.org/issue?@filter=status&@filter=components&components=4&status=1&@columns=id,activity,title,status&@sort=-activity
+.. _Python Developer's Guide: https://docs.python.org/devguide/
 .. _core-mentorship mailing list: https://mail.python.org/mailman/listinfo/core-mentorship/

diff --git a/Doc/conf.py b/Doc/conf.py
index f036f82d8aca37e113caa569e0649ccc8df0907d..8174032d64d3cc268f9a0ac8c2c6377179bc0732 100644 (file)
--- a/Doc/conf.py
+++ b/Doc/conf.py
@@ -67,7 +67,7 @@ html_additional_pages = {
 }
 
 # Output an OpenSearch description file.
-html_use_opensearch = 'http://docs.python.org/'
+html_use_opensearch = 'https://docs.python.org/'
 
 # Additional static files.
 html_static_path = ['tools/static']

diff --git a/Doc/distutils/apiref.rst b/Doc/distutils/apiref.rst
index d1201efb2495059247e2fd423d77f7a19e8adf3d..2a75a4627db8f10c5580209d0e4edf27bdb17da3 100644 (file)
--- a/Doc/distutils/apiref.rst
+++ b/Doc/distutils/apiref.rst
@@ -78,7 +78,7 @@ setup script). Indirectly provides the  :class:`distutils.dist.Distribution` and
    |                    | be built                       | :class:`distutils.core.Extension`                           |
    +--------------------+--------------------------------+-------------------------------------------------------------+
    | *classifiers*      | A list of categories for the   | a list of strings; valid classifiers are listed on `PyPI    |
-   |                    | package                        | <http://pypi.python.org/pypi?:action=list_classifiers>`_.   |
+   |                    | package                        | <https://pypi.python.org/pypi?:action=list_classifiers>`_.  |
    +--------------------+--------------------------------+-------------------------------------------------------------+
    | *distclass*        | the :class:`Distribution`      | a subclass of                                               |
    |                    | class to use                   | :class:`distutils.core.Distribution`                        |

diff --git a/Doc/distutils/examples.rst b/Doc/distutils/examples.rst
index 6c59b77ee2ec751ca7afa384d58e229771d24eaf..be108a328a0f8816b873743ceef2eb3effd642ba 100644 (file)
--- a/Doc/distutils/examples.rst
+++ b/Doc/distutils/examples.rst
@@ -11,7 +11,7 @@ Distutils Cookbook.
 
 .. seealso::
 
-   `Distutils Cookbook <http://wiki.python.org/moin/Distutils/Cookbook>`_
+   `Distutils Cookbook <https://wiki.python.org/moin/Distutils/Cookbook>`_
       Collection of recipes showing how to achieve more control over distutils.
 
 

diff --git a/Doc/distutils/setupscript.rst b/Doc/distutils/setupscript.rst
index 8e9815aa58f82e9d381459f731c45fb0cb0bd509..67327bd1a6409fca12469bee3dbc466a526121ed 100644 (file)
--- a/Doc/distutils/setupscript.rst
+++ b/Doc/distutils/setupscript.rst
@@ -28,7 +28,7 @@ the package into Python 1.5.2.) ::
           description='Python Distribution Utilities',
           author='Greg Ward',
           author_email='gward@python.net',
-          url='http://www.python.org/sigs/distutils-sig/',
+          url='https://www.python.org/sigs/distutils-sig/',
           packages=['distutils', 'distutils.command'],
          )
 
@@ -606,7 +606,7 @@ Notes:
 (4)
     These fields should not be used if your package is to be compatible with Python
     versions prior to 2.2.3 or 2.3.  The list is available from the `PyPI website
-    <http://pypi.python.org/pypi>`_.
+    <https://pypi.python.org/pypi>`_.
 
 (5)
     The ``long_description`` field is used by PyPI when you are

diff --git a/Doc/extending/building.rst b/Doc/extending/building.rst
index 08b0cc2ceda23e662020b695fef295e4df79beef..06d300547d4d058a7ed32dc13da000590a067edd 100644 (file)
--- a/Doc/extending/building.rst
+++ b/Doc/extending/building.rst
@@ -81,7 +81,7 @@ example below. ::
           description = 'This is a demo package',
           author = 'Martin v. Loewis',
           author_email = 'martin@v.loewis.de',
-          url = 'http://docs.python.org/extending/building',
+          url = 'https://docs.python.org/extending/building',
           long_description = '''
    This is really just a demo package.
    ''',

diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
index d76aa2499b26c1ad95fe77234ed609cebe6cef8a..de1849c4a408945cb875c58a31970c56d3b12d2e 100644 (file)
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -25,7 +25,7 @@ are some details that you need to understand before you can get started.
    Python 2.2.  This document documents how to define new types for Python 2.2 and
    later.  If you need to support older versions of Python, you will need to refer
    to `older versions of this documentation
-   <http://www.python.org/doc/versions/>`_.
+   <https://www.python.org/doc/versions/>`_.
 
 
 .. _dnt-basics:

diff --git a/Doc/faq/design.rst b/Doc/faq/design.rst
index 2c986d4f529dc8f61b9852611ee39d4e82647293..13a79fce1db186bb457e49183906db85d7231edc 100644 (file)
--- a/Doc/faq/design.rst
+++ b/Doc/faq/design.rst
@@ -398,13 +398,13 @@ calls into the Python run-time system, even for seemingly simple operations like
 ``x+1``.
 
 Several projects described in the Python newsgroup or at past `Python
-conferences <http://python.org/community/workshops/>`_ have shown that this
+conferences <https://www.python.org/community/workshops/>`_ have shown that this
 approach is feasible, although the speedups reached so far are only modest
 (e.g. 2x).  Jython uses the same strategy for compiling to Java bytecode.  (Jim
 Hugunin has demonstrated that in combination with whole-program analysis,
 speedups of 1000x are feasible for small demo programs.  See the proceedings
 from the `1997 Python conference
-<http://python.org/workshops/1997-10/proceedings/>`_ for more information.)
+<https://www.python.org/workshops/1997-10/proceedings/>`_ for more information.)
 
 Internally, Python source code is always translated into a bytecode
 representation, and this bytecode is then executed by the Python virtual

diff --git a/Doc/faq/general.rst b/Doc/faq/general.rst
index 986c67b5c1fd245b3c378c8af9cd704a5271b2b0..4e26eef252a187e7395198c4832d59c4f8d2c4b0 100644 (file)
--- a/Doc/faq/general.rst
+++ b/Doc/faq/general.rst
@@ -25,7 +25,7 @@ Finally, Python is portable: it runs on many Unix variants, on the Mac, and on
 PCs under MS-DOS, Windows, Windows NT, and OS/2.
 
 To find out more, start with :ref:`tutorial-index`.  The `Beginner's Guide to
-Python <http://wiki.python.org/moin/BeginnersGuide>`_ links to other
+Python <https://wiki.python.org/moin/BeginnersGuide>`_ links to other
 introductory tutorials and resources for learning Python.
 
 
@@ -36,11 +36,11 @@ The Python Software Foundation is an independent non-profit organization that
 holds the copyright on Python versions 2.1 and newer.  The PSF's mission is to
 advance open source technology related to the Python programming language and to
 publicize the use of Python.  The PSF's home page is at
-http://www.python.org/psf/.
+https://www.python.org/psf/.
 
 Donations to the PSF are tax-exempt in the US.  If you use Python and find it
 helpful, please contribute via `the PSF donation page
-<http://www.python.org/psf/donations/>`_.
+<https://www.python.org/psf/donations/>`_.
 
 
 Are there copyright restrictions on the use of Python?
@@ -53,12 +53,12 @@ commercial use, to sell copies of Python in source or binary form (modified or
 unmodified), or to sell products that incorporate Python in some form.  We would
 still like to know about all commercial use of Python, of course.
 
-See `the PSF license page <http://python.org/psf/license/>`_ to find further
+See `the PSF license page <https://www.python.org/psf/license/>`_ to find further
 explanations and a link to the full text of the license.
 
 The Python logo is trademarked, and in certain cases permission is required to
 use it.  Consult `the Trademark Usage Policy
-<http://www.python.org/psf/trademarks/>`__ for more information.
+<https://www.python.org/psf/trademarks/>`__ for more information.
 
 
 Why was Python created in the first place?
@@ -117,7 +117,7 @@ programming), software engineering (unit testing, logging, profiling, parsing
 Python code), and operating system interfaces (system calls, filesystems, TCP/IP
 sockets).  Look at the table of contents for :ref:`library-index` to get an idea
 of what's available.  A wide variety of third-party extensions are also
-available.  Consult `the Python Package Index <http://pypi.python.org/pypi>`_ to
+available.  Consult `the Python Package Index <https://pypi.python.org/pypi>`_ to
 find packages of interest to you.
 
 
@@ -159,8 +159,8 @@ How do I obtain a copy of the Python source?
 --------------------------------------------
 
 The latest Python source distribution is always available from python.org, at
-http://www.python.org/download/.  The latest development sources can be obtained
-via anonymous Mercurial access at http://hg.python.org/cpython.
+https://www.python.org/download/.  The latest development sources can be obtained
+via anonymous Mercurial access at https://hg.python.org/cpython.
 
 The source distribution is a gzipped tar file containing the complete C source,
 Sphinx-formatted documentation, Python library modules, example programs, and
@@ -178,8 +178,8 @@ How do I get documentation on Python?
 .. XXX mention py3k
 
 The standard documentation for the current stable version of Python is available
-at http://docs.python.org/.  PDF, plain text, and downloadable HTML versions are
-also available at http://docs.python.org/download.html.
+at https://docs.python.org/.  PDF, plain text, and downloadable HTML versions are
+also available at https://docs.python.org/download.html.
 
 The documentation is written in reStructuredText and processed by `the Sphinx
 documentation tool <http://sphinx-doc.org/>`__.  The reStructuredText source for
@@ -192,7 +192,7 @@ I've never programmed before. Is there a Python tutorial?
 There are numerous tutorials and books available.  The standard documentation
 includes :ref:`tutorial-index`.
 
-Consult `the Beginner's Guide <http://wiki.python.org/moin/BeginnersGuide>`_ to
+Consult `the Beginner's Guide <https://wiki.python.org/moin/BeginnersGuide>`_ to
 find information for beginning Python programmers, including lists of tutorials.
 
 
@@ -200,7 +200,7 @@ Is there a newsgroup or mailing list devoted to Python?
 -------------------------------------------------------
 
 There is a newsgroup, :newsgroup:`comp.lang.python`, and a mailing list,
-`python-list <http://mail.python.org/mailman/listinfo/python-list>`_.  The
+`python-list <https://mail.python.org/mailman/listinfo/python-list>`_.  The
 newsgroup and mailing list are gatewayed into each other -- if you can read news
 it's unnecessary to subscribe to the mailing list.
 :newsgroup:`comp.lang.python` is high-traffic, receiving hundreds of postings
@@ -209,38 +209,38 @@ every day, and Usenet readers are often more able to cope with this volume.
 Announcements of new software releases and events can be found in
 comp.lang.python.announce, a low-traffic moderated list that receives about five
 postings per day.  It's available as `the python-announce mailing list
-<http://mail.python.org/mailman/listinfo/python-announce-list>`_.
+<https://mail.python.org/mailman/listinfo/python-announce-list>`_.
 
 More info about other mailing lists and newsgroups
-can be found at http://www.python.org/community/lists/.
+can be found at https://www.python.org/community/lists/.
 
 
 How do I get a beta test version of Python?
 -------------------------------------------
 
-Alpha and beta releases are available from http://www.python.org/download/.  All
+Alpha and beta releases are available from https://www.python.org/download/.  All
 releases are announced on the comp.lang.python and comp.lang.python.announce
-newsgroups and on the Python home page at http://www.python.org/; an RSS feed of
+newsgroups and on the Python home page at https://www.python.org/; an RSS feed of
 news is available.
 
 You can also access the development version of Python through Subversion.  See
-http://docs.python.org/devguide/faq for details.
+https://docs.python.org/devguide/faq for details.
 
 
 How do I submit bug reports and patches for Python?
 ---------------------------------------------------
 
 To report a bug or submit a patch, please use the Roundup installation at
-http://bugs.python.org/.
+https://bugs.python.org/.
 
 You must have a Roundup account to report bugs; this makes it possible for us to
 contact you if we have follow-up questions.  It will also enable Roundup to send
 you updates as we act on your bug. If you had previously used SourceForge to
 report bugs to Python, you can obtain your Roundup password through Roundup's
-`password reset procedure <http://bugs.python.org/user?@template=forgotten>`_.
+`password reset procedure <https://bugs.python.org/user?@template=forgotten>`_.
 
 For more information on how Python is developed, consult `the Python Developer's
-Guide <http://docs.python.org/devguide/>`_.
+Guide <https://docs.python.org/devguide/>`_.
 
 
 Are there any published articles about Python that I can reference?
@@ -260,7 +260,7 @@ Are there any books on Python?
 ------------------------------
 
 Yes, there are many, and more are being published.  See the python.org wiki at
-http://wiki.python.org/moin/PythonBooks for a list.
+https://wiki.python.org/moin/PythonBooks for a list.
 
 You can also search online bookstores for "Python" and filter out the Monty
 Python references; or perhaps search for "Python" and "language".
@@ -270,10 +270,10 @@ Where in the world is www.python.org located?
 ---------------------------------------------
 
 The Python project's infrastructure is located all over the world.
-`www.python.org <http://www.python.org>`_ is currently in Amsterdam, graciously
+`www.python.org <https://www.python.org>`_ is currently in Amsterdam, graciously
 hosted by `XS4ALL <http://www.xs4all.nl>`_.  `Upfront Systems
 <http://www.upfrontsystems.co.za>`_ hosts `bugs.python.org
-<http://bugs.python.org>`_.  Most other Python services like `PyPI
+<https://bugs.python.org>`_.  Most other Python services like `PyPI
 <https://pypi.python.org>`_ and hg.python.org are hosted by `Oregon State
 University Open Source Lab <https://osuosl.org>`_.
 
@@ -312,7 +312,7 @@ guaranteed that interfaces will remain the same throughout a series of bugfix
 releases.
 
 The latest stable releases can always be found on the `Python download page
-<http://python.org/download/>`_.  There are two recommended production-ready
+<https://python.org/download/>`_.  There are two recommended production-ready
 versions at this point in time, because at the moment there are two branches of
 stable releases: 2.x and 3.x.  Python 3.x may be less useful than 2.x, since
 currently there is more third party software available for Python 2 than for
@@ -336,9 +336,9 @@ the group or even read it.
 Have any significant projects been done in Python?
 --------------------------------------------------
 
-See http://python.org/about/success for a list of projects that use Python.
+See https://python.org/about/success for a list of projects that use Python.
 Consulting the proceedings for `past Python conferences
-<http://python.org/community/workshops/>`_ will reveal contributions from many
+<https://python.org/community/workshops/>`_ will reveal contributions from many
 different companies and organizations.
 
 High-profile Python projects include `the Mailman mailing list manager
@@ -352,14 +352,14 @@ include Google, Yahoo, and Lucasfilm Ltd.
 What new developments are expected for Python in the future?
 ------------------------------------------------------------
 
-See http://www.python.org/dev/peps/ for the Python Enhancement Proposals
+See https://www.python.org/dev/peps/ for the Python Enhancement Proposals
 (PEPs). PEPs are design documents describing a suggested new feature for Python,
 providing a concise technical specification and a rationale.  Look for a PEP
 titled "Python X.Y Release Schedule", where X.Y is a version that hasn't been
 publicly released yet.
 
 New development is discussed on `the python-dev mailing list
-<http://mail.python.org/mailman/listinfo/python-dev/>`_.
+<https://mail.python.org/mailman/listinfo/python-dev/>`_.
 
 
 Is it reasonable to propose incompatible changes to Python?
@@ -448,7 +448,7 @@ of Python editing environments.
 
 If you want to discuss Python's use in education, you may be interested in
 joining `the edu-sig mailing list
-<http://python.org/community/sigs/current/edu-sig>`_.
+<https://www.python.org/community/sigs/current/edu-sig>`_.
 
 
 Upgrading Python

diff --git a/Doc/faq/installed.rst b/Doc/faq/installed.rst
index 390c85abe424ef589907e370955804b73f0c545a..b9907a6e8fc25f786c3f4404bdfa8d189f9eba0c 100644 (file)
--- a/Doc/faq/installed.rst
+++ b/Doc/faq/installed.rst
@@ -11,7 +11,7 @@ language because Python is easy to learn, but it's also used by professional
 software developers at places such as Google, NASA, and Lucasfilm Ltd.
 
 If you wish to learn more about Python, start with the `Beginner's Guide to
-Python <http://wiki.python.org/moin/BeginnersGuide>`_.
+Python <https://wiki.python.org/moin/BeginnersGuide>`_.
 
 
 Why is Python installed on my machine?

diff --git a/Doc/faq/library.rst b/Doc/faq/library.rst
index 0d80f7620ba75af3f8de13bcc6571af26a2d236c..e63819ccf8089283cba71e072f18514cea3d6e16 100644 (file)
--- a/Doc/faq/library.rst
+++ b/Doc/faq/library.rst
@@ -19,7 +19,7 @@ standard library module.  (Eventually you'll learn what's in the standard
 library and will be able to skip this step.)
 
 For third-party packages, search the `Python Package Index
-<http://pypi.python.org/pypi>`_ or try `Google <http://www.google.com>`_ or
+<https://pypi.python.org/pypi>`_ or try `Google <https://www.google.com>`_ or
 another Web search engine.  Searching for "Python" plus a keyword or two for
 your topic of interest will usually find something helpful.
 
@@ -585,7 +585,7 @@ substituted for standard input and output.  You will have to use pseudo ttys
 ("ptys") instead of pipes. Or you can use a Python interface to Don Libes'
 "expect" library.  A Python extension that interfaces to expect is called "expy"
 and available from http://expectpy.sourceforge.net.  A pure Python solution that
-works like expect is `pexpect <http://pypi.python.org/pypi/pexpect/>`_.
+works like expect is `pexpect <https://pypi.python.org/pypi/pexpect/>`_.
 
 
 How do I access the serial (RS232) port?
@@ -640,7 +640,7 @@ and client-side web systems.
 .. XXX check if wiki page is still up to date
 
 A summary of available frameworks is maintained by Paul Boddie at
-http://wiki.python.org/moin/WebProgramming\ .
+https://wiki.python.org/moin/WebProgramming\ .
 
 Cameron Laird maintains a useful set of pages about Python web technologies at
 http://phaseit.net/claird/comp.lang.python/web_python.
@@ -691,7 +691,7 @@ What module should I use to help with generating HTML?
 .. XXX add modern template languages
 
 You can find a collection of useful links on the `Web Programming wiki page
-<http://wiki.python.org/moin/WebProgramming>`_.
+<https://wiki.python.org/moin/WebProgramming>`_.
 
 
 How do I send mail from a Python script?
@@ -771,7 +771,7 @@ and :mod:`GDBM <gdbm>` are also included with standard Python.
 
 Support for most relational databases is available.  See the
 `DatabaseProgramming wiki page
-<http://wiki.python.org/moin/DatabaseProgramming>`_ for details.
+<https://wiki.python.org/moin/DatabaseProgramming>`_ for details.
 
 
 How do you implement persistent objects in Python?

diff --git a/Doc/faq/programming.rst b/Doc/faq/programming.rst
index f0dcdb58e7f384d77da429d8d60cb2a39d285bda..2dfdb3e6d831279a1378f8b7184a5b091a7e9fd4 100644 (file)
--- a/Doc/faq/programming.rst
+++ b/Doc/faq/programming.rst
@@ -24,7 +24,7 @@ for pdb as an example.
 The IDLE interactive development environment, which is part of the standard
 Python distribution (normally available as Tools/scripts/idle), includes a
 graphical debugger.  There is documentation for the IDLE debugger at
-http://www.python.org/idle/doc/idle2.html#Debugger.
+https://www.python.org/idle/doc/idle2.html#Debugger.
 
 PythonWin is a Python IDE that includes a GUI debugger based on pdb.  The
 Pythonwin debugger colors breakpoints and has quite a few cool features such as
@@ -146,10 +146,10 @@ development time, greater likelihood of bugs) unless the resulting performance
 benefit is worth it.
 
 There is a page on the wiki devoted to `performance tips
-<http://wiki.python.org/moin/PythonSpeed/PerformanceTips>`_.
+<https://wiki.python.org/moin/PythonSpeed/PerformanceTips>`_.
 
 Guido van Rossum has written up an anecdote related to optimization at
-http://www.python.org/doc/essays/list2str.
+https://www.python.org/doc/essays/list2str.
 
 One thing to notice is that function and (especially) method calls are rather
 expensive; if you have designed a purely OO interface with lots of tiny
@@ -207,7 +207,7 @@ not dealing with constant string patterns.  You may still use :ref:`the old %
 operations <string-formatting>` ``string % tuple`` and ``string % dictionary``.
 
 Be sure to use the :meth:`list.sort` built-in method to do sorting, and see the
-`sorting mini-HOWTO <http://wiki.python.org/moin/HowTo/Sorting>`_ for examples
+`sorting mini-HOWTO <https://wiki.python.org/moin/HowTo/Sorting>`_ for examples
 of moderately advanced usage.  :meth:`list.sort` beats other techniques for
 sorting in all but the most extreme circumstances.
 

diff --git a/Doc/glossary.rst b/Doc/glossary.rst
index ff8ebdeb8b94ecc086735a083db750b2c0d15904..33398053ee81407b081b76646d5a2b65a4a9a193 100644 (file)
--- a/Doc/glossary.rst
+++ b/Doc/glossary.rst
@@ -75,7 +75,7 @@ Glossary
 
    BDFL
       Benevolent Dictator For Life, a.k.a. `Guido van Rossum
-      <http://www.python.org/~guido/>`_, Python's creator.
+      <https://www.python.org/~guido/>`_, Python's creator.
 
    bytes-like object
       An object that supports the :ref:`buffer protocol <bufferobjects>`,
@@ -140,7 +140,7 @@ Glossary
 
    CPython
       The canonical implementation of the Python programming language, as
-      distributed on `python.org <http://python.org>`_.  The term "CPython"
+      distributed on `python.org <https://www.python.org>`_.  The term "CPython"
       is used when necessary to distinguish this implementation from others
       such as Jython or IronPython.
 
@@ -511,7 +511,7 @@ Glossary
    method resolution order
       Method Resolution Order is the order in which base classes are searched
       for a member during lookup. See `The Python 2.3 Method Resolution Order
-      <http://www.python.org/download/releases/2.3/mro/>`_.
+      <https://www.python.org/download/releases/2.3/mro/>`_.
 
    module
       An object that serves as an organizational unit of Python code.  Modules

diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst
index d644512c15d014316e78cf3cf8e05e34ba2d439a..abedfaa537a38e69d7e83e30b4384bf2bab0924d 100644 (file)
--- a/Doc/howto/descriptor.rst
+++ b/Doc/howto/descriptor.rst
@@ -133,7 +133,7 @@ Note, in Python 2.2, ``super(B, obj).m()`` would only invoke :meth:`__get__` if
 invoked unless an old-style class is involved.  The implementation details are
 in :c:func:`super_getattro()` in :source:`Objects/typeobject.c`.
 
-.. _`Guido's Tutorial`: http://www.python.org/2.2.3/descrintro.html#cooperation
+.. _`Guido's Tutorial`: https://www.python.org/2.2.3/descrintro.html#cooperation
 
 The details above show that the mechanism for descriptors is embedded in the
 :meth:`__getattribute__()` methods for :class:`object`, :class:`type`, and

diff --git a/Doc/howto/functional.rst b/Doc/howto/functional.rst
index c6d6a56a7ea7bae81401dd9a46deda15f87b4f75..e12e67b8b523562f4cce4cad887ffc58a0d6e75c 100644 (file)
--- a/Doc/howto/functional.rst
+++ b/Doc/howto/functional.rst
@@ -741,7 +741,7 @@ the constructed list's ``.sort()`` method. ::
     [9878, 9828, 8442, 7953, 6431, 6213, 2207, 769]
 
 (For a more detailed discussion of sorting, see the Sorting mini-HOWTO in the
-Python wiki at http://wiki.python.org/moin/HowTo/Sorting.)
+Python wiki at https://wiki.python.org/moin/HowTo/Sorting.)
 
 The ``any(iter)`` and ``all(iter)`` built-ins look at the truth values of an
 iterable's contents.  :func:`any` returns ``True`` if any element in the iterable is

diff --git a/Doc/howto/logging-cookbook.rst b/Doc/howto/logging-cookbook.rst
index 47cf0f44a55cc0008b4e7c20067ab491a0f15b3d..69fdcca28e35a862d494cbd7255e331eb4bc41a6 100644 (file)
--- a/Doc/howto/logging-cookbook.rst
+++ b/Doc/howto/logging-cookbook.rst
@@ -587,7 +587,7 @@ file from your processes. The existing :class:`FileHandler` and subclasses do
 not make use of :mod:`multiprocessing` at present, though they may do so in the
 future. Note that at present, the :mod:`multiprocessing` module does not provide
 working lock functionality on all platforms (see
-http://bugs.python.org/issue3770).
+https://bugs.python.org/issue3770).
 
 
 Using file rotation

diff --git a/Doc/howto/pyporting.rst b/Doc/howto/pyporting.rst
index 9d7e8598c14db66b824b494d653776b25c2fea4d..b997df7dd2c292f7d2f1bb85791af148e2295023 100644 (file)
--- a/Doc/howto/pyporting.rst
+++ b/Doc/howto/pyporting.rst
@@ -588,7 +588,7 @@ thanks for making public their tips for porting Python 2 code to Python 3 (and
 thus helping provide information for this document and its various revisions
 over the years):
 
-* http://wiki.python.org/moin/PortingPythonToPy3k
+* https://wiki.python.org/moin/PortingPythonToPy3k
 * http://python3porting.com/
 * http://docs.pythonsprints.com/python3_porting/py-porting.html
 * http://techspot.zzzeek.org/2011/01/24/zzzeek-s-guide-to-python-3-porting/
@@ -602,23 +602,23 @@ please email the python-porting_ mailing list.
 
 
 
-.. _2to3: http://docs.python.org/2/library/2to3.html
+.. _2to3: https://docs.python.org/2/library/2to3.html
 .. _3to2: https://pypi.python.org/pypi/3to2
 .. _Cheeseshop: PyPI_
 .. _coverage: https://pypi.python.org/pypi/coverage
 .. _future: http://python-future.org/
 .. _modernize: https://github.com/mitsuhiko/python-modernize
 .. _Porting to Python 3: http://python3porting.com/
-.. _PyPI: http://pypi.python.org/
-.. _Python 2.2: http://www.python.org/2.2.x
-.. _Python 2.5: http://www.python.org/2.5.x
-.. _Python 2.6: http://www.python.org/2.6.x
-.. _Python 2.7: http://www.python.org/2.7.x
-.. _Python 2.5: http://www.python.org/2.5.x
-.. _Python 3.3: http://www.python.org/3.3.x
+.. _PyPI: https://pypi.python.org/
+.. _Python 2.2: https://www.python.org/2.2.x
+.. _Python 2.5: https://www.python.org/2.5.x
+.. _Python 2.6: https://www.python.org/2.6.x
+.. _Python 2.7: https://www.python.org/2.7.x
+.. _Python 2.5: https://www.python.org/2.5.x
+.. _Python 3.3: https://www.python.org/3.3.x
 .. _Python 3 Packages: https://pypi.python.org/pypi?:action=browse&c=533&show=all
 .. _Python 3 Q & A: http://ncoghlan-devs-python-notes.readthedocs.org/en/latest/python3/questions_and_answers.html
-.. _python-porting: http://mail.python.org/mailman/listinfo/python-porting
+.. _python-porting: https://mail.python.org/mailman/listinfo/python-porting
 .. _six: https://pypi.python.org/pypi/six
 .. _tox: https://pypi.python.org/pypi/tox
 .. _trove classifiers: https://pypi.python.org/pypi?%3Aaction=list_classifiers

diff --git a/Doc/howto/unicode.rst b/Doc/howto/unicode.rst
index 297e87e091be04af7057ae739b9accf53b960210..437f208f5ba8704350952fd93adb341b0b67c645 100644 (file)
--- a/Doc/howto/unicode.rst
+++ b/Doc/howto/unicode.rst
@@ -7,7 +7,7 @@
 This HOWTO discusses Python 2.x's support for Unicode, and explains
 various problems that people commonly encounter when trying to work
 with Unicode.  For the Python 3 version, see
-<http://docs.python.org/py3k/howto/unicode.html>.
+<https://docs.python.org/3/howto/unicode.html>.
 
 Introduction to Unicode
 =======================
@@ -435,7 +435,7 @@ When you run it with Python 2.4, it will output the following warning::
     amk:~$ python2.4 p263.py
     sys:1: DeprecationWarning: Non-ASCII character '\xe9'
          in file p263.py on line 2, but no encoding declared;
-         see http://www.python.org/peps/pep-0263.html for details
+         see https://www.python.org/peps/pep-0263.html for details
 
 Python 2.5 and higher are stricter and will produce a syntax error::
 
@@ -443,7 +443,7 @@ Python 2.5 and higher are stricter and will produce a syntax error::
     File "/tmp/p263.py", line 2
     SyntaxError: Non-ASCII character '\xc3' in file /tmp/p263.py
       on line 2, but no encoding declared; see
-      http://www.python.org/peps/pep-0263.html for details
+      https://www.python.org/peps/pep-0263.html for details
 
 
 Unicode Properties

diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst
index d13f174ac253721e1bb875465e15a13e8c745d06..33c08fdc2664e0050649cc889b370383dc255bee 100644 (file)
--- a/Doc/howto/urllib2.rst
+++ b/Doc/howto/urllib2.rst
@@ -24,7 +24,7 @@ Introduction
 
         A tutorial on *Basic Authentication*, with examples in Python.
 
-**urllib2** is a `Python <http://www.python.org>`_ module for fetching URLs
+**urllib2** is a Python module for fetching URLs
 (Uniform Resource Locators). It offers a very simple interface, in the form of
 the *urlopen* function. This is capable of fetching URLs using a variety of
 different protocols. It also offers a slightly more complex interface for

diff --git a/Doc/howto/webservers.rst b/Doc/howto/webservers.rst
index c3b79e448d74155c859404ed434e4f692814b5b9..6cd5fc1524b97168d6dde92c2e1ae94a4a3bba98 100644 (file)
--- a/Doc/howto/webservers.rst
+++ b/Doc/howto/webservers.rst
@@ -26,7 +26,7 @@ of the most popular libraries is provided.
    While this HOWTO tries to give an overview of Python in the web, it cannot
    always be as up to date as desired.  Web development in Python is rapidly
    moving forward, so the wiki page on `Web Programming
-   <http://wiki.python.org/moin/WebProgramming>`_ may be more in sync with
+   <https://wiki.python.org/moin/WebProgramming>`_ may be more in sync with
    recent development.
 
 
@@ -86,7 +86,7 @@ available.
      applications, instead of presenting a "500 Internal Server Error" message
 
    The Python wiki features a page on `CGI scripts
-   <http://wiki.python.org/moin/CgiScripts>`_ with some additional information
+   <https://wiki.python.org/moin/CgiScripts>`_ with some additional information
    about CGI in Python.
 
 
@@ -308,7 +308,7 @@ following WSGI-application::
     WSGIServer(app).run()
 
 This is a simple WSGI application, but you need to install `flup
-<http://pypi.python.org/pypi/flup/1.0>`_ first, as flup handles the low level
+<https://pypi.python.org/pypi/flup/1.0>`_ first, as flup handles the low level
 FastCGI access.
 
 .. seealso::
@@ -485,7 +485,7 @@ developing a web site.
 
    There are far more components than can be presented here.  The Python wiki
    has a page about these components, called
-   `Web Components <http://wiki.python.org/moin/WebComponents>`_.
+   `Web Components <https://wiki.python.org/moin/WebComponents>`_.
 
 
 Templates
@@ -532,7 +532,7 @@ Popular template engines include:
 
    There are many template engines competing for attention, because it is
    pretty easy to create them in Python.  The page `Templating
-   <http://wiki.python.org/moin/Templating>`_ in the wiki lists a big,
+   <https://wiki.python.org/moin/Templating>`_ in the wiki lists a big,
    ever-growing number of these.  The three listed above are considered "second
    generation" template engines and are a good place to start.
 
@@ -582,11 +582,11 @@ alternate storage mechanism.
 
 .. seealso::
 
-   * `Persistence Tools <http://wiki.python.org/moin/PersistenceTools>`_ lists
+   * `Persistence Tools <https://wiki.python.org/moin/PersistenceTools>`_ lists
      possibilities on how to save data in the file system.  Some of these
      modules are part of the standard library
 
-   * `Database Programming <http://wiki.python.org/moin/DatabaseProgramming>`_
+   * `Database Programming <https://wiki.python.org/moin/DatabaseProgramming>`_
      helps with choosing a method for saving data
 
    * `SQLAlchemy <http://www.sqlalchemy.org/>`_, the most powerful OR-Mapper
@@ -736,9 +736,9 @@ found in the Python wiki.
 .. seealso::
 
    The Python wiki contains an extensive list of `web frameworks
-   <http://wiki.python.org/moin/WebFrameworks>`_.
+   <https://wiki.python.org/moin/WebFrameworks>`_.
 
    Most frameworks also have their own mailing lists and IRC channels, look out
    for these on the projects' web sites.  There is also a general "Python in the
    Web" IRC channel on freenode called `#python.web
-   <http://wiki.python.org/moin/PoundPythonWeb>`_.
+   <https://wiki.python.org/moin/PoundPythonWeb>`_.

diff --git a/Doc/includes/email-alternative.py b/Doc/includes/email-alternative.py
old mode 100644 (file)
new mode 100755 (executable)
index 82d605e..ccecb42
--- a/Doc/includes/email-alternative.py
+++ b/Doc/includes/email-alternative.py
@@ -17,14 +17,14 @@ msg['From'] = me
 msg['To'] = you
 
 # Create the body of the message (a plain-text and an HTML version).
-text = "Hi!\nHow are you?\nHere is the link you wanted:\nhttp://www.python.org"
+text = "Hi!\nHow are you?\nHere is the link you wanted:\nhttps://www.python.org"
 html = """\
 <html>
   <head></head>
   <body>
     <p>Hi!<br>
        How are you?<br>
-       Here is the <a href="http://www.python.org">link</a> you wanted.
+       Here is the <a href="https://www.python.org">link</a> you wanted.
     </p>
   </body>
 </html>

diff --git a/Doc/library/bz2.rst b/Doc/library/bz2.rst
index 6793c44de991d6c5f688e7afe25381caf61dea7b..71957ec06e5844ab0329534b95789272a8b4baa3 100644 (file)
--- a/Doc/library/bz2.rst
+++ b/Doc/library/bz2.rst
@@ -74,7 +74,7 @@ Handling of compressed files is offered by the :class:`BZ2File` class.
       input file, only the first stream will be accessible. If you require
       support for multi-stream files, consider using the third-party
       :mod:`bz2file` module (available from
-      `PyPI <http://pypi.python.org/pypi/bz2file>`_). This module provides a
+      `PyPI <https://pypi.python.org/pypi/bz2file>`_). This module provides a
       backport of Python 3.3's :class:`BZ2File` class, which does support
       multi-stream files.
 

diff --git a/Doc/library/datetime.rst b/Doc/library/datetime.rst
index db952691a265fcb5cef637a74b75c3c0c51100e6..15a4fe43863ce820b0e62adb40b7976c8bd0cddf 100644 (file)
--- a/Doc/library/datetime.rst
+++ b/Doc/library/datetime.rst
@@ -1563,7 +1563,7 @@ EST (fixed offset -5 hours), or only EDT (fixed offset -4 hours)).
 
 .. seealso::
 
-   `pytz <http://pypi.python.org/pypi/pytz/>`_
+   `pytz <https://pypi.python.org/pypi/pytz/>`_
       The standard library has no :class:`tzinfo` instances, but
       there exists a third-party library which brings the *IANA timezone
       database* (also known as the Olson database) to Python: *pytz*.

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index d8a3dcfb3ebcf7bf44d89930ebd46e1a63c57ea0..c9d34dc7e7c9ae84a98ad2cf845437aa4667eed3 100644 (file)
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1324,7 +1324,7 @@ available.  They are listed here in alphabetical order.
    example, sort by department, then by salary grade).
 
    For sorting examples and a brief sorting tutorial, see `Sorting HowTo
-   <http://wiki.python.org/moin/HowTo/Sorting/>`_\.
+   <https://wiki.python.org/moin/HowTo/Sorting/>`_\.
 
    .. versionadded:: 2.4
 

diff --git a/Doc/library/index.rst b/Doc/library/index.rst
index 71ba916a54d15632b0b33d60f0111a96532d5aba..5d335e4d9d35bf133c34dad5904c6e6d8b0a11a2 100644 (file)
--- a/Doc/library/index.rst
+++ b/Doc/library/index.rst
@@ -30,7 +30,7 @@ optional components.
 In addition to the standard library, there is a growing collection of
 several thousand components (from individual programs and modules to
 packages and entire application development frameworks), available from
-the `Python Package Index <http://pypi.python.org/pypi>`_.
+the `Python Package Index <https://pypi.python.org/pypi>`_.
 
 
 .. toctree::

diff --git a/Doc/library/othergui.rst b/Doc/library/othergui.rst
index 1ee5c5bf7121da019b61df94be9115fb12869653..ba26e74157ee63e1e232f5c9a0953a3dfc1348c3 100644 (file)
--- a/Doc/library/othergui.rst
+++ b/Doc/library/othergui.rst
@@ -45,7 +45,7 @@ available for Python:
 PyGTK, PyQt, and wxPython, all have a modern look and feel and more
 widgets than Tkinter. In addition, there are many other GUI toolkits for
 Python, both cross-platform, and platform-specific. See the `GUI Programming
-<http://wiki.python.org/moin/GuiProgramming>`_ page in the Python Wiki for a
+<https://wiki.python.org/moin/GuiProgramming>`_ page in the Python Wiki for a
 much more complete list, and also for links to documents where the
 different GUI toolkits are compared.
 

diff --git a/Doc/library/popen2.rst b/Doc/library/popen2.rst
index 628ec6e7688d2337682b20d805245f8fb01b10d6..0960255d8b70e443b14cde3a131d6043eb8e69c6 100644 (file)
--- a/Doc/library/popen2.rst
+++ b/Doc/library/popen2.rst
@@ -153,7 +153,7 @@ is reading from the first process, also in a blocking fashion.
 
 .. Example explanation and suggested work-arounds substantially stolen
    from Martin von Löwis:
-   http://mail.python.org/pipermail/python-dev/2000-September/009460.html
+   https://mail.python.org/pipermail/python-dev/2000-September/009460.html
 
 There are several ways to deal with this situation.
 

diff --git a/Doc/library/pydoc.rst b/Doc/library/pydoc.rst
index 8343452b95ae1ad52c55e31bb8af618b13f630be..df37b71b850e60ea23d3288eb3b7f3ea909a555c 100644 (file)
--- a/Doc/library/pydoc.rst
+++ b/Doc/library/pydoc.rst
@@ -69,7 +69,7 @@ documents precisely the version of the module you would get if you started the
 Python interpreter and typed ``import spam``.
 
 Module docs for core modules are assumed to reside in
-http://docs.python.org/library/.  This can be overridden by setting the
+https://docs.python.org/library/.  This can be overridden by setting the
 :envvar:`PYTHONDOCS` environment variable to a different URL or to a local
 directory containing the Library Reference Manual pages.
 

diff --git a/Doc/library/sys.rst b/Doc/library/sys.rst
index 48d2b5b2d086a213a2df5764d254746c7b747430..e1900c7232c01b6fdc11f11300fab2ac50e0a297 100644 (file)
--- a/Doc/library/sys.rst
+++ b/Doc/library/sys.rst
@@ -1014,7 +1014,7 @@ always available.
    .. versionadded:: 2.5
 
    .. note::
-      Python is now `developed <http://docs.python.org/devguide/>`_ using
+      Python is now `developed <https://docs.python.org/devguide/>`_ using
       Mercurial.  In recent Python 2.7 bugfix releases, :data:`subversion`
       therefore contains placeholder information.  It is removed in Python
       3.3.

diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index d82c407df78ecf9154a7ddf529331d0434d0428d..556829af26d8d8b03028ec531fd5d3ee753d19e5 100644 (file)
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -78,7 +78,7 @@ need to derive from a specific class.
    Module :mod:`doctest`
       Another test-support module with a very different flavor.
 
-   `unittest2: A backport of new unittest features for Python 2.4-2.6 <http://pypi.python.org/pypi/unittest2>`_
+   `unittest2: A backport of new unittest features for Python 2.4-2.6 <https://pypi.python.org/pypi/unittest2>`_
       Many new features were added to unittest in Python 2.7, including test
       discovery. unittest2 allows you to use these features with earlier
       versions of Python.
@@ -91,7 +91,7 @@ need to derive from a specific class.
       Third-party unittest frameworks with a lighter-weight syntax for writing
       tests.  For example, ``assert func(10) == 42``.
 
-   `The Python Testing Tools Taxonomy <http://wiki.python.org/moin/PythonTestingToolsTaxonomy>`_
+   `The Python Testing Tools Taxonomy <https://wiki.python.org/moin/PythonTestingToolsTaxonomy>`_
       An extensive list of Python testing tools including functional testing
       frameworks and mock object libraries.
 

diff --git a/Doc/library/xml.dom.rst b/Doc/library/xml.dom.rst
index 541d6496e18d2641426a28d6435b2327e3155969..b496aa1713cdf966f924afb670a0aea3d5b7d8d0 100644 (file)
--- a/Doc/library/xml.dom.rst
+++ b/Doc/library/xml.dom.rst
@@ -36,7 +36,7 @@ DOM Level 2 recommendation.
 .. XXX PyXML is dead...
 .. The mapping of the Level 3 specification, currently
    only available in draft form, is being developed by the `Python XML Special
-   Interest Group <http://www.python.org/sigs/xml-sig/>`_ as part of the `PyXML
+   Interest Group <https://www.python.org/sigs/xml-sig/>`_ as part of the `PyXML
    package <http://pyxml.sourceforge.net/>`_.  Refer to the documentation bundled
    with that package for information on the current state of DOM Level 3 support.
 

diff --git a/Doc/library/xmllib.rst b/Doc/library/xmllib.rst
index 43cbce9e012017bfa52b06a0eaf302480601820f..1e4c7767e59575f29aa2c465eae90cecfa062210 100644 (file)
--- a/Doc/library/xmllib.rst
+++ b/Doc/library/xmllib.rst
@@ -255,11 +255,11 @@ parsing text files formatted in XML (Extensible Markup Language).
       material on XML, including translations of the specification, are available at
       http://www.w3.org/XML/.
 
-   `Python and XML Processing <http://www.python.org/topics/xml/>`_
+   `Python and XML Processing <https://www.python.org/topics/xml/>`_
       The Python XML Topic Guide provides a great deal of information on using XML
       from Python and links to other sources of information on XML.
 
-   `SIG for XML Processing in Python <http://www.python.org/sigs/xml-sig/>`_
+   `SIG for XML Processing in Python <https://www.python.org/sigs/xml-sig/>`_
       The Python XML Special Interest Group is developing substantial support for
       processing XML from Python.
 

diff --git a/Doc/license.rst b/Doc/license.rst
index 5c5b269d1a9d69e5653023e3966b4cebee5dc4a0..3663a883c0f78e847d64ac02e20748d4da30679a 100644 (file)
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -23,7 +23,7 @@ In May 2000, Guido and the Python core development team moved to BeOpen.com to
 form the BeOpen PythonLabs team.  In October of the same year, the PythonLabs
 team moved to Digital Creations (now Zope Corporation; see
 http://www.zope.com/).  In 2001, the Python Software Foundation (PSF, see
-http://www.python.org/psf/) was formed, a non-profit organization created
+https://www.python.org/psf/) was formed, a non-profit organization created
 specifically to own Python-related Intellectual Property.  Zope Corporation is a
 sponsoring member of the PSF.
 

diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index ae0ad393375f06c464281fbd4fda5568a93199be..206853b27d990e2ae93cb2c94361879300403e71 100644 (file)
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -783,7 +783,7 @@ Classes
    inheritance structures where there are multiple inheritance paths
    leading back to a common ancestor. Additional details on the C3 MRO used by
    new-style classes can be found in the documentation accompanying the
-   2.3 release at http://www.python.org/download/releases/2.3/mro/.
+   2.3 release at https://www.python.org/download/releases/2.3/mro/.
 
    .. XXX: Could we add that MRO doc as an appendix to the language ref?
 
@@ -1148,7 +1148,7 @@ in case of multiple inheritance.
 
 While this manual aims to provide comprehensive coverage of Python's class
 mechanics, it may still be lacking in some areas when it comes to its coverage
-of new-style classes. Please see http://www.python.org/doc/newstyle/ for
+of new-style classes. Please see https://www.python.org/doc/newstyle/ for
 sources of additional information.
 
 .. index::

diff --git a/Doc/tools/static/version_switch.js b/Doc/tools/static/version_switch.js
index e5528ebcef01f477638619d2e6d824ca3ca3da6e..edb025b8abae6b3ff01e4ff251a8da89a10bbffc 100644 (file)
--- a/Doc/tools/static/version_switch.js
+++ b/Doc/tools/static/version_switch.js
@@ -50,7 +50,7 @@
            window.location.href = new_url;
         },
         error: function() {
-           window.location.href = 'http://docs.python.org/' + selected;
+           window.location.href = 'https://docs.python.org/' + selected;
         }
       });
     }

diff --git a/Doc/tutorial/classes.rst b/Doc/tutorial/classes.rst
index 77c050b4cce14c3e6bd493648784cf021afd6590..8970a660a9488c37d5cf18f48dca7246159f00ed 100644 (file)
--- a/Doc/tutorial/classes.rst
+++ b/Doc/tutorial/classes.rst
@@ -600,7 +600,7 @@ parent only once, and that is monotonic (meaning that a class can be subclassed
 without affecting the precedence order of its parents).  Taken together, these
 properties make it possible to design reliable and extensible classes with
 multiple inheritance.  For more detail, see
-http://www.python.org/download/releases/2.3/mro/.
+https://www.python.org/download/releases/2.3/mro/.
 
 
 .. _tut-private:

diff --git a/Doc/tutorial/index.rst b/Doc/tutorial/index.rst
index df10385bf634a0ee89963f886890008938ffa153..c14b1d6774ca54cf9f2f06e8ddb5bcc1292a53e3 100644 (file)
--- a/Doc/tutorial/index.rst
+++ b/Doc/tutorial/index.rst
@@ -12,7 +12,7 @@ and rapid application development in many areas on most platforms.
 
 The Python interpreter and the extensive standard library are freely available
 in source or binary form for all major platforms from the Python Web site,
-http://www.python.org/, and may be freely distributed. The same site also
+https://www.python.org/, and may be freely distributed. The same site also
 contains distributions of and pointers to many free third party Python modules,
 programs and tools, and additional documentation.
 

diff --git a/Doc/tutorial/whatnow.rst b/Doc/tutorial/whatnow.rst
index 48ff5c8029f3995736010617a44a71a061793d68..1ff4ae3d2cc5a76a9ca417f5cb2c83caf218f214 100644 (file)
--- a/Doc/tutorial/whatnow.rst
+++ b/Doc/tutorial/whatnow.rst
@@ -30,15 +30,15 @@ the set are:
 
 More Python resources:
 
-* http://www.python.org:  The major Python Web site.  It contains code,
+* https://www.python.org:  The major Python Web site.  It contains code,
   documentation, and pointers to Python-related pages around the Web.  This Web
   site is mirrored in various places around the world, such as Europe, Japan, and
   Australia; a mirror may be faster than the main site, depending on your
   geographical location.
 
-* http://docs.python.org:  Fast access to Python's  documentation.
+* https://docs.python.org:  Fast access to Python's  documentation.
 
-* http://pypi.python.org: The Python Package Index, previously also nicknamed
+* https://pypi.python.org: The Python Package Index, previously also nicknamed
   the Cheese Shop, is an index of user-created Python modules that are available
   for download.  Once you begin releasing code, you can register it here so that
   others can find it.
@@ -56,7 +56,7 @@ around 120 postings a day (with peaks up to several hundred), asking (and
 answering) questions, suggesting new features, and announcing new modules.
 Before posting, be sure to check the list of :ref:`Frequently Asked Questions
 <faq-index>` (also called the FAQ).  Mailing list
-archives are available at http://mail.python.org/pipermail/. The FAQ answers
+archives are available at https://mail.python.org/pipermail/. The FAQ answers
 many of the questions that come up again and again, and may already contain the
 solution for your problem.
 

diff --git a/Doc/using/mac.rst b/Doc/using/mac.rst
index 5f29812e448f79ef7d76b42576bc4dd81406061f..3a6b7976e8a5aab019d6a2c8947af94509ff870a 100644 (file)
--- a/Doc/using/mac.rst
+++ b/Doc/using/mac.rst
@@ -27,7 +27,7 @@ Getting and Installing MacPython
 
 Mac OS X 10.8 comes with Python 2.7 pre-installed by Apple.  If you wish, you
 are invited to install the most recent version of Python from the Python website
-(http://www.python.org).  A current "universal binary" build of Python, which
+(https://www.python.org).  A current "universal binary" build of Python, which
 runs natively on the Mac's new Intel and legacy PPC CPU's, is available there.
 
 What you get after installing is a number of things:
@@ -181,9 +181,9 @@ Other Resources
 The MacPython mailing list is an excellent support resource for Python users and
 developers on the Mac:
 
-http://www.python.org/community/sigs/current/pythonmac-sig/
+https://www.python.org/community/sigs/current/pythonmac-sig/
 
 Another useful resource is the MacPython wiki:
 
-http://wiki.python.org/moin/MacPython
+https://wiki.python.org/moin/MacPython
 

diff --git a/Doc/using/unix.rst b/Doc/using/unix.rst
index 6a66a30b9fcaa5760d04cd06909bb542082f652c..010513b9312fcb74fd1d15c24039804756e028e7 100644 (file)
--- a/Doc/using/unix.rst
+++ b/Doc/using/unix.rst
@@ -63,9 +63,9 @@ Building Python
 ===============
 
 If you want to compile CPython yourself, first thing you should do is get the
-`source <http://python.org/download/source/>`_. You can download either the
+`source <https://www.python.org/download/source/>`_. You can download either the
 latest release's source or just grab a fresh `clone
-<http://docs.python.org/devguide/setup#getting-the-source-code>`_.  (If you want
+<https://docs.python.org/devguide/setup#getting-the-source-code>`_.  (If you want
 to contribute patches, you will need a clone.)
 
 The build process consists in the usual ::

diff --git a/Doc/using/windows.rst b/Doc/using/windows.rst
index 20f642c2b7fa88822bff07df02976c58690be4f2..4911288404079cf734d2667cb10dff2b577887e5 100644 (file)
--- a/Doc/using/windows.rst
+++ b/Doc/using/windows.rst
@@ -18,7 +18,7 @@ Installing Python
 Unlike most Unix systems and services, Windows does not require Python natively
 and thus does not pre-install a version of Python.  However, the CPython team
 has compiled Windows installers (MSI packages) with every `release
-<http://www.python.org/download/releases/>`_ for many years.
+<https://www.python.org/download/releases/>`_ for many years.
 
 With ongoing development of Python, some platforms that used to be supported
 earlier are no longer supported (due to the lack of users or developers).
@@ -38,7 +38,7 @@ Check :pep:`11` for details on all unsupported platforms.
   release/python>`_, `Maintainer releases
   <http://www.tishler.net/jason/software/python/>`_)
 
-See `Python for Windows (and DOS) <http://www.python.org/download/windows/>`_
+See `Python for Windows (and DOS) <https://www.python.org/download/windows/>`_
 for detailed information about platforms with precompiled installers.
 
 .. seealso::
@@ -255,7 +255,7 @@ utilities for:
   user interfaces
 
 `PythonWin <http://web.archive.org/web/20060524042422/
-http://www.python.org/windows/pythonwin/>`_ is a sample MFC application
+https://www.python.org/windows/pythonwin/>`_ is a sample MFC application
 shipped with PyWin32.  It is an embeddable IDE with a built-in debugger.
 
 .. seealso::
@@ -292,9 +292,9 @@ Compiling Python on Windows
 ===========================
 
 If you want to compile CPython yourself, first thing you should do is get the
-`source <http://python.org/download/source/>`_. You can download either the
+`source <https://www.python.org/download/source/>`_. You can download either the
 latest release's source or just grab a fresh `checkout
-<http://docs.python.org/devguide/setup#checking-out-the-code>`_.
+<https://docs.python.org/devguide/setup#checking-out-the-code>`_.
 
 For Microsoft Visual C++, which is the compiler with which official Python
 releases are built, the source tree contains solutions/project files.  View the

diff --git a/Doc/whatsnew/2.0.rst b/Doc/whatsnew/2.0.rst
index 3bb12b666c78680a88558bf42ca3430e661a334c..f7998e6978b537c1f926ec12bae1d49b539b78a2 100644 (file)
--- a/Doc/whatsnew/2.0.rst
+++ b/Doc/whatsnew/2.0.rst
@@ -130,7 +130,7 @@ Guidelines":
 Read the rest of PEP 1 for the details of the PEP editorial process, style, and
 format.  PEPs are kept in the Python CVS tree on SourceForge, though they're not
 part of the Python 2.0 distribution, and are also available in HTML form from
-http://www.python.org/peps/.  As of September 2000, there are 25 PEPS, ranging
+https://www.python.org/peps/.  As of September 2000, there are 25 PEPS, ranging
 from PEP 201, "Lockstep Iteration", to PEP 225, "Elementwise/Objectwise
 Operators".
 
@@ -566,7 +566,7 @@ such as ``cmp(a,b)`` would always produce an answer, even if a user-defined
 simply be silently swallowed.
 
 .. Starting URL:
-.. http://www.python.org/pipermail/python-dev/2000-April/004834.html
+.. https://www.python.org/pipermail/python-dev/2000-April/004834.html
 
 Work has been done on porting Python to 64-bit Windows on the Itanium processor,
 mostly by Trent Mick of ActiveState.  (Confusingly, ``sys.platform`` is still
@@ -1003,7 +1003,7 @@ Relationship to PyXML
 
 The XML Special Interest Group has been working on XML-related Python code for a
 while.  Its code distribution, called PyXML, is available from the SIG's Web
-pages at http://www.python.org/sigs/xml-sig/. The PyXML distribution also used
+pages at https://www.python.org/sigs/xml-sig/. The PyXML distribution also used
 the package name ``xml``.  If you've written programs that used PyXML, you're
 probably wondering about its compatibility with the 2.0 :mod:`xml` package.
 

diff --git a/Doc/whatsnew/2.1.rst b/Doc/whatsnew/2.1.rst
index c8330689c7a06ee31b12b59b3a12234ee8b4a92c..019741c0ef5cdbf53bdfd794617973821b826141 100644 (file)
--- a/Doc/whatsnew/2.1.rst
+++ b/Doc/whatsnew/2.1.rst
@@ -562,7 +562,7 @@ You can start creating packages containing :file:`PKG-INFO` even if you're not
 using Python 2.1, since a new release of the Distutils will be made for users of
 earlier Python versions.  Version 1.0.2 of the Distutils includes the changes
 described in PEP 241, as well as various bugfixes and enhancements.  It will be
-available from  the Distutils SIG at http://www.python.org/sigs/distutils-sig/.
+available from  the Distutils SIG at https://www.python.org/sigs/distutils-sig/.
 
 
 .. seealso::
@@ -731,7 +731,7 @@ of the more notable changes are:
          ...
 
   For a fuller discussion of the line I/O changes, see the python-dev summary for
-  January 1-15, 2001 at http://www.python.org/dev/summary/2001-01-1/.
+  January 1-15, 2001 at https://www.python.org/dev/summary/2001-01-1/.
 
 * A new method, :meth:`popitem`, was added to dictionaries to enable
   destructively iterating through the contents of a dictionary; this can be faster

diff --git a/Doc/whatsnew/2.2.rst b/Doc/whatsnew/2.2.rst
index 5f6fe11d7784e366c12bfee46577504c4d6cdd21..3eb9ce8258a2e044da44792caebd396f470bbccb 100644 (file)
--- a/Doc/whatsnew/2.2.rst
+++ b/Doc/whatsnew/2.2.rst
@@ -24,8 +24,8 @@ up irregularities and dark corners of the language design.
 This article doesn't attempt to provide a complete specification of the new
 features, but instead provides a convenient overview.  For full details, you
 should refer to the documentation for Python 2.2, such as the `Python Library
-Reference <http://www.python.org/doc/2.2/lib/lib.html>`_ and the `Python
-Reference Manual <http://www.python.org/doc/2.2/ref/ref.html>`_.  If you want to
+Reference <https://www.python.org/doc/2.2/lib/lib.html>`_ and the `Python
+Reference Manual <https://www.python.org/doc/2.2/ref/ref.html>`_.  If you want to
 understand the complete implementation and design rationale for a change, refer
 to the PEP for a particular new feature.
 
@@ -395,7 +395,7 @@ This section has just been a quick overview of the new features, giving enough
 of an explanation to start you programming, but many details have been
 simplified or ignored.  Where should you go to get a more complete picture?
 
-http://www.python.org/2.2/descrintro.html is a lengthy tutorial introduction to
+https://www.python.org/2.2/descrintro.html is a lengthy tutorial introduction to
 the descriptor features, written by Guido van Rossum. If my description has
 whetted your appetite, go read this tutorial next, because it goes into much
 more detail about the new features while still remaining quite easy to read.

diff --git a/Doc/whatsnew/2.3.rst b/Doc/whatsnew/2.3.rst
index 85fea6823248a31d648c94a0900c303e7748071b..d017c64d682ec6fc924744cfa2d61a7085d51889 100644 (file)
--- a/Doc/whatsnew/2.3.rst
+++ b/Doc/whatsnew/2.3.rst
@@ -657,7 +657,7 @@ The heart of the catalog is the new Distutils :command:`register` command.
 Running ``python setup.py register`` will collect the metadata describing a
 package, such as its name, version, maintainer, description, &c., and send it to
 a central catalog server.  The resulting catalog is available from
-http://www.python.org/pypi.
+https://pypi.python.org/pypi.
 
 To make the catalog a bit more useful, a new optional *classifiers* keyword
 argument has been added to the Distutils :func:`setup` function.  A list of
@@ -1082,9 +1082,9 @@ Here are all of the changes that Python 2.3 makes to the core Python language.
   C3 algorithm as described in the paper `"A Monotonic Superclass Linearization
   for Dylan" <http://www.webcom.com/haahr/dylan/linearization-oopsla96.html>`_. To
   understand the motivation for this change,  read Michele Simionato's article
-  `"Python 2.3 Method Resolution Order" <http://www.python.org/2.3/mro.html>`_, or
+  `"Python 2.3 Method Resolution Order" <https://www.python.org/2.3/mro.html>`_, or
   read the thread on python-dev starting with the message at
-  http://mail.python.org/pipermail/python-dev/2002-October/029035.html. Samuele
+  https://mail.python.org/pipermail/python-dev/2002-October/029035.html. Samuele
   Pedroni first pointed out the problem and also implemented the fix by coding the
   C3 algorithm.
 
@@ -1564,7 +1564,7 @@ complete list of changes, or look through the CVS logs for all the details.
   to the correct thread, and waiting for the results.  Other interfaces can't be
   handled automatically but :mod:`Tkinter` will now raise an exception on such an
   access so that you can at least find out about the problem.  See
-  http://mail.python.org/pipermail/python-dev/2002-December/031107.html for a more
+  https://mail.python.org/pipermail/python-dev/2002-December/031107.html for a more
   detailed explanation of this change.  (Implemented by Martin von Löwis.)
 
 * Calling Tcl methods through :mod:`_tkinter` no longer  returns only strings.
@@ -1858,7 +1858,7 @@ and bundle it with the source of your extension.
 
 .. seealso::
 
-   http://svn.python.org/view/python/trunk/Objects/obmalloc.c
+   https://svn.python.org/view/python/trunk/Objects/obmalloc.c
       For the full details of the pymalloc implementation, see the comments at
       the top of the file :file:`Objects/obmalloc.c` in the Python source code.
       The above link points to the file within the python.org SVN browser.

diff --git a/Doc/whatsnew/2.4.rst b/Doc/whatsnew/2.4.rst
index fa6c124abc9470b4d834add6fb44389ac6c8cbbb..73ba5b9cec96da2f8f4bd434d17d88ddd0783980 100644 (file)
--- a/Doc/whatsnew/2.4.rst
+++ b/Doc/whatsnew/2.4.rst
@@ -337,7 +337,7 @@ returned.
       wrote patches implementing function decorators, but the one that was actually
       checked in was patch #979728, written by Mark Russell.
 
-   http://www.python.org/moin/PythonDecoratorLibrary
+   https://www.python.org/moin/PythonDecoratorLibrary
       This Wiki page contains several examples of decorators.
 
 .. ======================================================================

diff --git a/Doc/whatsnew/2.5.rst b/Doc/whatsnew/2.5.rst
index c420a19fc72ba29131b2abd4a5ba85437562e144..9d2e124f56f3e5076a2d68a5a83bfa7740a7d9d1 100644 (file)
--- a/Doc/whatsnew/2.5.rst
+++ b/Doc/whatsnew/2.5.rst
@@ -39,7 +39,7 @@ finds there were 353 patches applied and 458 bugs fixed between Python 2.4 and
 This article doesn't try to be a complete specification of the new features;
 instead changes are briefly introduced using helpful examples.  For full
 details, you should always refer to the documentation for Python 2.5 at
-http://docs.python.org. If you want to understand the complete implementation
+https://docs.python.org. If you want to understand the complete implementation
 and design rationale, refer to the PEP for a particular new feature.
 
 Comments, suggestions, and error reports for this document are welcome; please
@@ -229,7 +229,7 @@ required packages. ::
         )
 
 Another new enhancement to the Python package index at
-http://cheeseshop.python.org is storing source and binary archives for a
+https://pypi.python.org is storing source and binary archives for a
 package.  The new :command:`upload` Distutils command will upload a package to
 the repository.
 
@@ -2130,7 +2130,7 @@ Changes to Python's build process and to the C API include:
   such as PyCon.
 
   .. List of names taken from Jeremy's python-dev post at
-  .. http://mail.python.org/pipermail/python-dev/2005-October/057500.html
+  .. https://mail.python.org/pipermail/python-dev/2005-October/057500.html
 
 * Evan Jones's patch to obmalloc, first described in a talk at PyCon DC 2005,
   was applied.  Python 2.4 allocated small objects in 256K-sized arenas, but never

diff --git a/Doc/whatsnew/2.6.rst b/Doc/whatsnew/2.6.rst
index cefdcaf57741fa3b912b430a2d91177bd34b813a..54ded7ad4b4ce9440868d5a2d0d7a6f5b235a438 100644 (file)
--- a/Doc/whatsnew/2.6.rst
+++ b/Doc/whatsnew/2.6.rst
@@ -162,7 +162,7 @@ is an open-source project that requires volunteers
 to administer it and a server to host it.
 
 After posting a call for volunteers, a new Roundup installation was
-set up at http://bugs.python.org.  One installation of Roundup can
+set up at https://bugs.python.org.  One installation of Roundup can
 host multiple trackers, and this server now also hosts issue trackers
 for Jython and for the Python web site.  It will surely find
 other uses in the future.  Where possible,
@@ -179,7 +179,7 @@ other projects wishing to move from SourceForge to Roundup.
 
 .. seealso::
 
-  http://bugs.python.org
+  https://bugs.python.org
     The Python bug tracker.
 
   http://bugs.jython.org:
@@ -225,15 +225,15 @@ the Python community.
 
 Sphinx is a standalone package that can be used for writing, and
 almost two dozen other projects
-(`listed on the Sphinx web site <http://sphinx.pocoo.org/examples.html>`__)
+(`listed on the Sphinx web site <http://sphinx-doc.org/examples.html>`__)
 have adopted Sphinx as their documentation tool.
 
 .. seealso::
 
-   `Documenting Python <http://docs.python.org/devguide/documenting.html>`__
+   `Documenting Python <https://docs.python.org/devguide/documenting.html>`__
        Describes how to write for Python's documentation.
 
-   `Sphinx <http://sphinx.pocoo.org/>`__
+   `Sphinx <http://sphinx-doc.org/>`__
      Documentation and code for the Sphinx toolchain.
 
    `Docutils <http://docutils.sf.net>`__

diff --git a/Doc/whatsnew/2.7.rst b/Doc/whatsnew/2.7.rst
index 4f07c93c52777d7fea2d0b7e4a2747686d8dc30c..6aeea32342dddaac1da0c550cd2f3a9a8fc21e4f 100644 (file)
--- a/Doc/whatsnew/2.7.rst
+++ b/Doc/whatsnew/2.7.rst
@@ -68,9 +68,9 @@ included in 2.7.
 This article doesn't attempt to provide a complete specification of
 the new features, but instead provides a convenient overview.  For
 full details, you should refer to the documentation for Python 2.7 at
-http://docs.python.org. If you want to understand the rationale for
+https://docs.python.org. If you want to understand the rationale for
 the design and implementation, refer to the PEP for a particular new
-feature or the issue on http://bugs.python.org in which a change was
+feature or the issue on https://bugs.python.org in which a change was
 discussed.  Whenever possible, "What's New in Python" links to the
 bug/patch item for each change.
 
@@ -1767,7 +1767,7 @@ a complete list of functions.
 
 The Distutils package and :mod:`sysconfig` are now maintained by Tarek
 Ziadé, who has also started a Distutils2 package (source repository at
-http://hg.python.org/distutils2/) for developing a next-generation
+https://hg.python.org/distutils2/) for developing a next-generation
 version of Distutils.
 
 
@@ -1804,7 +1804,7 @@ new features were added.  Most of these features were implemented
 by Michael Foord, unless otherwise noted.  The enhanced version of
 the module is downloadable separately for use with Python versions 2.4 to 2.6,
 packaged as the :mod:`unittest2` package, from
-http://pypi.python.org/pypi/unittest2.
+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 <http://pytest.org>`__ or