Merge pull request #961 from apjanke/fix-broken-or-redirect-links

Fix redirected and broken links

Author: mpoulin

docs/_templates/sidebarintro.html

@@ -59,8 +59,8 @@ <h3>Contributors</h3>
 <h3>Useful Links</h3>
 <ul>
   <li><a href="https://docs.python-guide.org/">The Guide Website</a></li>
-  <li><a href="http://github.com/realpython/python-guide">The Guide @ GitHub</a></li>
-  <li><a href="http://github.com/realpython/python-guide/issues">Issue Tracker</a></li>
+  <li><a href="https://github.com/realpython/python-guide">The Guide @ GitHub</a></li>
+  <li><a href="https://github.com/realpython/python-guide/issues">Issue Tracker</a></li>
   <li><a href="https://media.readthedocs.org/pdf/python-guide/latest/python-guide.pdf">The Guide as a PDF</a></li>
 </ul>
 
@@ -69,8 +69,8 @@ <h3>Translations</h3>
   <li><a href="https://docs.python-guide.org/">English</a></li>
   <li><a href="https://python-guide-fr.readthedocs.io/fr/latest/">French</a></li>
   <li><a href="https://pythonguidecn.readthedocs.io/zh/latest/">Chinese</a></li>
-  <li><a href="http://python-guideja.readthedocs.io/ja/latest/">Japanese</a></li>
+  <li><a href="https://python-guideja.readthedocs.io/ja/latest/">Japanese</a></li>
   <li><a href="https://python-guide-kr.readthedocs.io/ko/latest/">Korean</a></li>
-  <li><a href="http://python-guide-fil.readthedocs.io/en/latest/">Filipino</a></li>
-  <li><a href="http://python-guide-pt-br.readthedocs.io/pt_BR/latest/">Brazilian Portuguese</a></li>
+  <li><a href="https://python-guide-fil.readthedocs.io/en/latest/">Filipino</a></li>
+  <li><a href="https://python-guide-pt-br.readthedocs.io/pt_BR/latest/">Brazilian Portuguese</a></li>
 </ul>

docs/conf.py

@@ -46,7 +46,7 @@
 
 # General information about the project.
 project = u'pythonguide'
-copyright = u'2011–2018 <a href="http://kennethreitz.com/pages/open-projects.html">Kenneth Reitz</a> &amp; <a href="https://realpython.com">Real Python</a>. <a href="http://creativecommons.org/licenses/by-nc-sa/3.0/">CC BY-NC-SA 3.0</a>'
+copyright = u'2011–2018 <a href="https://www.kennethreitz.org/projects">Kenneth Reitz</a> &amp; <a href="https://realpython.com">Real Python</a>. <a href="https://creativecommons.org/licenses/by-nc-sa/3.0/">CC BY-NC-SA 3.0</a>'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

docs/dev/env.rst

@@ -87,10 +87,10 @@ using ``<Tab>`` key or any other customized keys.
 
 .. _indent: http://www.vim.org/scripts/script.php?script_id=974
 .. _syntax: http://www.vim.org/scripts/script.php?script_id=790
-.. _Pyflakes: http://pypi.python.org/pypi/pyflakes/
-.. _pycodestyle: https://pypi.python.org/pypi/pycodestyle/
-.. _syntastic: https://github.com/scrooloose/syntastic
-.. _Python-mode: https://github.com/klen/python-mode
+.. _Pyflakes: http://pypi.org/project/pyflakes/
+.. _pycodestyle: https://pypi.org/project/pycodestyle/
+.. _syntastic: https://github.com/vim-syntastic/syntastic
+.. _Python-mode: https://github.com/python-mode/python-mode
 .. _SuperTab: http://www.vim.org/scripts/script.php?script_id=1643
 .. _vim-flake8: https://github.com/nvie/vim-flake8
 
@@ -103,7 +103,7 @@ Emacs user is `Python Programming in Emacs`_ at EmacsWiki.
 
 1. Emacs itself comes with a Python mode.
 
-.. _Python Programming in Emacs: http://emacswiki.org/emacs/PythonProgrammingInEmacs
+.. _Python Programming in Emacs: https://www.emacswiki.org/emacs/PythonProgrammingInEmacs
 
 TextMate
 --------
@@ -135,7 +135,7 @@ Atom
 Atom is web native (HTML, CSS, JS), focusing on modular design and easy plugin
 development. It comes with native package control and a plethora of packages.
 Recommended for Python development is
-`Linter <https://github.com/AtomLinter/Linter>`_ combined with
+`Linter <https://github.com/steelbrain/linter>`_ combined with
 `linter-flake8 <https://github.com/AtomLinter/linter-flake8>`_.
 
 
@@ -163,21 +163,21 @@ MIT licensed.
 
 Enthought Canopy
 ----------------
-`Enthought Canopy <https://www.enthought.com/products/canopy/>`_ is a Python
+`Enthought Canopy <https://www.enthought.com/product/canopy/>`_ is a Python
 IDE which is focused towards Scientists and Engineers as it provides pre
 installed libraries for data analysis.
 
 Eclipse
 -------
 
 The most popular Eclipse plugin for Python development is Aptana's
-`PyDev <http://pydev.org>`_.
+`PyDev <https://pydev.org>`_.
 
 
 Komodo IDE
 ----------
 
-`Komodo IDE <http://www.activestate.com/komodo-ide>`_ is developed by
+`Komodo IDE <https://www.activestate.com/products/komodo-ide/>`_ is developed by
 ActiveState and is a commercial IDE for Windows, Mac, and Linux.
 `KomodoEdit <https://github.com/Komodo/KomodoEdit>`_ is the open source
 alternative.
@@ -188,8 +188,8 @@ Spyder
 
 `Spyder <https://github.com/spyder-ide/spyder>`_ is an IDE specifically geared
 toward working with scientific Python libraries (namely
-`SciPy <http://www.scipy.org/>`_). It includes integration with pyflakes_,
-`pylint <http://www.logilab.org/857>`_ and
+`SciPy <https://www.scipy.org/>`_). It includes integration with pyflakes_,
+`pylint <https://www.logilab.org/857>`_ and
 `rope <https://github.com/python-rope/rope>`_.
 
 Spyder is open source (free), offers code completion, syntax highlighting,
@@ -242,13 +242,13 @@ Virtual Environments
 Virtual Environments provide a powerful way to isolate project package dependencies. This means that you can use packages particular to a Python project without installing them system wide and thus avoiding potential version conflicts.
 
 To start using and see more information:
-`Virtual Environments <http://github.com/kennethreitz/python-guide/blob/master/docs/dev/virtualenvs.rst>`_ docs.
+`Virtual Environments <https://github.com/kennethreitz/python-guide/blob/master/docs/dev/virtualenvs.rst>`_ docs.
 
 
 pyenv
 -----
 
-`pyenv <https://github.com/yyuu/pyenv>`_ is a tool to allow multiple versions
+`pyenv <https://github.com/pyenv/pyenv-virtualenv>`_ is a tool to allow multiple versions
 of the Python interpreter to be installed at the same time.  This solves the
 problem of having different projects requiring different versions of Python.
 For example, it becomes very easy to install Python 2.7 for compatibility in
@@ -264,7 +264,7 @@ pyenv.  pyenv then works out which version of Python should be run based on
 environment variables, ``.python-version`` files, and the global default.
 
 pyenv isn't a tool for managing virtual environments, but there is the plugin
-`pyenv-virtualenv <https://github.com/yyuu/pyenv-virtualenv>`_ which automates
+`pyenv-virtualenv <https://github.com/pyenv/pyenv-virtualenv>`_ which automates
 the creation of different environments, and also makes it possible to use the
 existing pyenv tools to switch to different environments based on environment
 variables or ``.python-version`` files.
@@ -314,7 +314,7 @@ To download and install IPython with all its optional dependencies for the noteb
 BPython
 -------
 
-`bpython <http://bpython-interpreter.org/>`_ is an alternative interface to the
+`bpython <https://bpython-interpreter.org/>`_ is an alternative interface to the
 Python interpreter for Unix-like operating systems. It has the following
 features:
 
@@ -334,8 +334,8 @@ features:
 ptpython
 --------
 
-`ptpython <https://github.com/jonathanslenders/ptpython/>`_ is a REPL build
-on top of the `prompt_toolkit <http://github.com/jonathanslenders/python-prompt-toolkit>`_
+`ptpython <https://github.com/prompt-toolkit/ptpython>`_ is a REPL build
+on top of the `prompt_toolkit <https://github.com/prompt-toolkit/python-prompt-toolkit>`_
 library. It is considered to be an alternative to BPython_. Features include:
 
 * Syntax highlighting

docs/dev/virtualenvs.rst

@@ -200,7 +200,7 @@ Congratulations, you now know how to install and use Python packages! ✨ 🍰 
 Lower level: virtualenv
 =======================
 
-`virtualenv <http://pypi.python.org/pypi/virtualenv>`_ is a tool to create
+`virtualenv <http://pypi.org/project/virtualenv>`_ is a tool to create
 isolated Python environments. virtualenv creates a folder which contains all the
 necessary executables to use the packages that a Python project would need.
 

docs/intro/duction.rst

@@ -28,11 +28,11 @@ include:
   object serialization, and much more.
 
   Additionally, the
-  `Python Package Index <http://pypi.python.org/pypi/>`_ is available
+  `Python Package Index <https://pypi.org>`_ is available
   for users to submit their packages for widespread use, similar to
-  Perl's `CPAN <http://www.cpan.org>`_. There is a thriving community
+  Perl's `CPAN <https://www.cpan.org>`_. There is a thriving community
   of very powerful Python frameworks and tools like
-  the `Django <http://www.djangoproject.com>`_ web framework and the
+  the `Django <https://www.djangoproject.com>`_ web framework and the
   `NumPy <http://numpy.scipy.org>`_ set of math routines.
 
 * **integration with other systems**

docs/intro/learning.rst

@@ -41,14 +41,14 @@ thepythonguru.com is a tutorial focused on beginner programmers. It covers many
 in depth. It also teaches you some advanced constructs of Python like lambda expressions and regular expressions.
 And last it finishes off with the tutorial "How to access MySQL db using Python"
 
-   `Python for Beginners <http://thepythonguru.com/>`_
+   `Python for Beginners <https://thepythonguru.com/>`_
 
 Learn Python Interactive Tutorial
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Learnpython.org is an easy non-intimidating way to get introduced to Python.
 The website takes the same approach used on the popular
-`Try Ruby <http://tryruby.org/>`_ website. It has an interactive Python
+`Try Ruby <https://ruby.github.io/TryRuby>`_ website. It has an interactive Python
 interpreter built into the site that allows you to go through the lessons
 without having to install Python locally.
 
@@ -65,9 +65,9 @@ resource for learning all aspects of the language.
 Learn Python Step by Step
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Techbeamers.com provides step-by-step tutorials to teach Python. Each tutorial is supplemented with logically added coding snippets and equips with a follow-up quiz on the subject learned. There is a section for `Python interview questions <http://www.techbeamers.com/python-interview-questions-programmers>`_ to help job seekers. You can also read essential `Python tips <http://www.techbeamers.com/essential-python-tips-tricks-programmers>`_ and learn `best coding practices <http://www.techbeamers.com/python-code-optimization-tips-tricks>`_ for writing quality code. Here, you'll get the right platform to learn Python quickly.
+Techbeamers.com provides step-by-step tutorials to teach Python. Each tutorial is supplemented with logically added coding snippets and equips with a follow-up quiz on the subject learned. There is a section for `Python interview questions <https://www.techbeamers.com/python-interview-questions-programmers>`_ to help job seekers. You can also read essential `Python tips <https://www.techbeamers.com/essential-python-tips-tricks-programmers>`_ and learn `best coding practices <https://www.techbeamers.com/python-code-optimization-tips-tricks>`_ for writing quality code. Here, you'll get the right platform to learn Python quickly.
 
-`Learn Python Basic to Advanced <http://www.techbeamers.com/python-tutorial-step-by-step>`_
+`Learn Python Basic to Advanced <https://www.techbeamers.com/python-tutorial-step-by-step>`_
 
 
 Online Python Tutor
@@ -108,7 +108,7 @@ Learn Python the Hard Way
 This is an excellent beginner programmer's guide to Python. It covers "hello
 world" from the console to the web.
 
-    `Learn Python the Hard Way <http://learnpythonthehardway.org/book/>`_
+    `Learn Python the Hard Way <https://learnpythonthehardway.org/book/>`_
 
 
 Crash into Python
@@ -117,7 +117,7 @@ Crash into Python
 Also known as *Python for Programmers with 3 Hours*, this guide gives
 experienced developers from other languages a crash course on Python.
 
-    `Crash into Python <http://stephensugden.com/crash_into_python/>`_
+    `Crash into Python <https://stephensugden.com/crash_into_python/>`_
 
 
 Dive Into Python 3
@@ -161,11 +161,11 @@ For those used to languages and figuring out puzzles on their own, this can be
 a fun, attractive option. For those new to Python and programming, having an
 additional resource or reference will be helpful.
 
-    `Python Koans <http://bitbucket.org/gregmalcolm/python_koans>`_
+    `Python Koans <https://bitbucket.org/gregmalcolm/python_koans>`_
 
 More information about test driven development can be found at these resources:
 
-    `Test Driven Development <http://en.wikipedia.org/wiki/Test-driven_development>`_
+    `Test Driven Development <https://en.wikipedia.org/wiki/Test-driven_development>`_
 
 
 A Byte of Python
@@ -178,13 +178,15 @@ no previous programming experience.
     `A Byte of Python for Python 3.x <https://python.swaroopch.com/>`_
 
 
-Learn to Program in Python with Codeacademy
+Computer Science Path on Codecademy
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-A Codeacademy course for the absolute Python beginner. This free and interactive course provides and teaches the basics (and beyond) of Python programming while testing the user's knowledge in between progress.
+A Codeacademy course for the absolute Python beginner. This free and interactive 
+course provides and teaches the basics (and beyond) of Python programming while 
+testing the user's knowledge in between progress.
 This course also features a built-in interpreter for receiving instant feedback on your learning.
 
-    `Learn to Program in Python with Codeacademy <http://www.codecademy.com/en/tracks/python>`_
+    `Computer Science Path on Codecademy <https://www.codecademy.com/learn/paths/computer-science>`_
 
 
 Code the blocks
@@ -220,7 +222,7 @@ pages, it is a very brief overview of some of the most common adapations
 programmers need to make to become efficient intermediate level Python
 programmers.
 
-    `Effective Python <http://www.effectivepython.com/>`_
+    `Effective Python <https://effectivepython.com/>`_
 
 
 ********
@@ -251,7 +253,7 @@ and eventually an application, including a chapter on using zc.buildout.  Later
 chapters detail best practices such as writing documentation, test-driven
 development, version control, optimization, and profiling.
 
-    `Expert Python Programming <http://www.packtpub.com/expert-python-programming/book>`_
+    `Expert Python Programming <https://www.packtpub.com/application-development/expert-python-programming>`_
 
 
 A Guide to Python's Magic Methods
@@ -278,15 +280,15 @@ A Primer on Scientific Programming with Python, written by Hans Petter
 Langtangen, mainly covers Python's usage in the scientific field. In the book,
 examples are chosen from mathematics and the natural sciences.
 
-    `A Primer on Scientific Programming with Python <http://www.springer.com/mathematics/computational+science+%26+engineering/book/978-3-642-30292-3>`_
+    `A Primer on Scientific Programming with Python <https://www.springer.com/us/book/9783642302930#otherversion=9783642302923>`_
 
 Numerical Methods in Engineering with Python
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Numerical Methods in Engineering with Python, written by Jaan Kiusalaas,
 puts the emphasis on numerical methods and how to implement them in Python.
 
-    `Numerical Methods in Engineering with Python <http://www.cambridge.org/us/academic/subjects/engineering/engineering-mathematics-and-programming/numerical-methods-engineering-python-2nd-edition>`_
+    `Numerical Methods in Engineering with Python <https://www.cambridge.org/us/academic/subjects/engineering/engineering-mathematics-and-programming/numerical-methods-engineering-python-2nd-edition>`_
 
 
 ********************
@@ -405,6 +407,6 @@ some commonly used piece of code, followed by an explanation of why the idiom
 is important. It also contains two code samples for each idiom: the "Harmful"
 way to write it and the "Idiomatic" way.
 
-	`For Python 2.7.3+ <http://www.amazon.com/Writing-Idiomatic-Python-2-7-3-Knupp/dp/1482372177/>`_
+	`For Python 2.7.3+ <https://www.amazon.com/Writing-Idiomatic-Python-Jeff-Knupp-ebook/dp/B00B5KG0F8/>`_
 
-	`For Python 3.3+  <http://www.amazon.com/Writing-Idiomatic-Python-Jeff-Knupp-ebook/dp/B00B5VXMRG/>`_
+	`For Python 3.3+  <https://www.amazon.com/Writing-Idiomatic-Python-Jeff-Knupp-ebook/dp/B00B5VXMRG/>`_

docs/intro/news.rst

@@ -32,7 +32,7 @@ Planet Python
 
 This is an aggregate of Python news from a growing number of developers.
 
-    `Planet Python <http://planet.python.org>`_
+    `Planet Python <https://planetpython.org>`_
 
 
 *********
@@ -42,7 +42,7 @@ This is an aggregate of Python news from a growing number of developers.
 /r/python is the Reddit Python community where users contribute and vote on
 Python-related news.
 
-    `/r/python <http://reddit.com/r/python>`_
+    `/r/python <https://reddit.com/r/python>`_
 
 
 *******************
@@ -70,7 +70,7 @@ Python Weekly
 Python Weekly is a free weekly newsletter featuring curated news, articles,
 new releases, jobs, etc. related to Python.
 
-    `Python Weekly <http://www.pythonweekly.com/>`_
+    `Python Weekly <https://www.pythonweekly.com/>`_
 
 
 ***********
@@ -80,7 +80,7 @@ Python News
 Python News is the news section in the official Python web site
 (www.python.org). It briefly highlights the news from the Python community.
 
-    `Python News <http://www.python.org/news/>`_
+    `Python News <http://www.python.org/blogs/>`_
 
 
 ********************

docs/notes/contribute.rst

@@ -30,5 +30,5 @@ If you'd like to contribute, there's plenty to do. Here's a short todo_ list.
     .. include:: ../../TODO.rst
 
 
-.. _GitHub: http://github.com/kennethreitz/python-guide/
+.. _GitHub: https://github.com/kennethreitz/python-guide/
 .. _todo: https://github.com/kennethreitz/python-guide/blob/master/TODO.rst

docs/scenarios/cli.rst

@@ -46,7 +46,7 @@ POSIX-style usage instructions.
 Plac
 ****
 
-`Plac <https://pypi.python.org/pypi/plac>`_ is a simple wrapper
+`Plac <https://pypi.org/project/plac>`_ is a simple wrapper
 over the Python standard library `argparse <http://docs.python.org/2/library/argparse.html>`_,
 which hides most of its complexity by using a declarative interface: the
 argument parser is inferred rather than written down imperatively. This

docs/scenarios/client.rst

@@ -29,7 +29,7 @@ pooling are 100% automatic, powered by urllib3, which is embedded within
 Requests.
 
 - `Documentation <http://docs.python-requests.org/en/latest/index.html>`_
-- `PyPi <http://pypi.python.org/pypi/requests>`_
+- `PyPi <http://pypi.org/project/requests>`_
 - `GitHub <https://github.com/kennethreitz/requests>`_