Merge from 3.x: PR #7611

.ciocheck

@@ -16,7 +16,7 @@ add_init = true
 
 # -----------------------------------------------------------------------------
 # pep8
-# http://pep8.readthedocs.io/en/latest/intro.html#configuration
+# https://pep8.readthedocs.io/en/latest/intro.html#configuration
 # -----------------------------------------------------------------------------
 [pep8]
 exclude = */tests/*
@@ -33,7 +33,7 @@ inherit = false
 
 # -----------------------------------------------------------------------------
 # Flake 8
-# http://flake8.readthedocs.io/en/latest/config.html
+# http://flake8.pycqa.org/en/latest/user/configuration.html
 # -----------------------------------------------------------------------------
 [flake8]
 exclude = */tests/*
@@ -73,7 +73,7 @@ spaces_before_comment = 2
 
 # -----------------------------------------------------------------------------
 # autopep8
-# http://pep8.readthedocs.io/en/latest/intro.html#configuration
+# https://pep8.readthedocs.io/en/latest/intro.html#configuration
 # -----------------------------------------------------------------------------
 [autopep8]
 exclude = */tests/*

CONTRIBUTING.md

@@ -229,7 +229,7 @@ https://github.com/spyder-ide/spyder/wiki/Troubleshooting-Guide-and-FAQ)
 
 [Gitter Chatroom](https://gitter.im/spyder-ide/public)
 
-[Google Group](http://groups.google.com/group/spyderlib)
+[Google Group](https://groups.google.com/group/spyderlib)
 
 [@Spyder_IDE on Twitter](https://twitter.com/spyder_ide)
 

README.md

@@ -123,7 +123,7 @@ able to provide limited assistance if you do run into trouble.
 Other install options exist, including:
 
 * The [WinPython](https://winpython.github.io/) distribution for Windows
-* The [MacPorts](http://www.macports.org/) project for macOS
+* The [MacPorts](https://www.macports.org/) project for macOS
 * Your distribution's package manager (i.e. `apt-get`, `yum`, etc) on Linux
 * The `pip` package manager, included with most Python installations
 

TROUBLESHOOTING.md

@@ -308,7 +308,7 @@ Spyder-related platforms
     While it is still under very early alpha development and isn't polished for
     public consumption, it does contain basic information about Spyder and
     links to many other helpful resources.
-*   **Spyder Google Group**: <http://groups.google.com/group/spyderlib>
+*   **Spyder Google Group**: <https://groups.google.com/group/spyderlib>
     Great for your more help-related questions, particularly those
     you aren't sure are a full-on Spyder issue, or you'd like to give
     more general feedback or ask questions of the team.

png-convert-and-optimize.sh

@@ -6,8 +6,8 @@
 # For more information, see PR 2216:
 # https://github.com/spyder-ide/spyder/pull/2216
 # and this soluation is based on:
-# http://stackoverflow.com/questions/22745076/libpng-warning-iccp-known-incorrect-srgb-profile
-# http://tex.stackexchange.com/questions/125612/warning-pdflatex-libpng-warning-iccp-known-incorrect-srgb-profile
+# https://stackoverflow.com/questions/22745076/libpng-warning-iccp-known-incorrect-srgb-profile
+# https://tex.stackexchange.com/questions/125612/warning-pdflatex-libpng-warning-iccp-known-incorrect-srgb-profile
 #
 # make sure to run this from the top level spyder repo dir in order to catch
 # all the png files

spyder/__init__.py

@@ -32,7 +32,7 @@
 __version__ = '.'.join(map(str, version_info))
 __license__ = __doc__
 __project_url__ = 'https://github.com/spyder-ide/spyder'
-__forum_url__   = 'http://groups.google.com/group/spyderlib'
+__forum_url__   = 'https://groups.google.com/group/spyderlib'
 __trouble_url__ = __project_url__ + '/wiki/Troubleshooting-Guide-and-FAQ'
 __trouble_url_short__ = 'https://tinyurl.com/SpyderHelp'
 __website_url__ = 'https://www.spyder-ide.org/'

spyder/app/mainwindow.py

@@ -226,9 +226,9 @@ class MainWindow(QMainWindow):
           _("Python2 documentation")),
          ('Python3', "https://docs.python.org/3/index.html",
           _("Python3 documentation")),
-         ('numpy', "http://docs.scipy.org/doc/",
+         ('numpy', "https://docs.scipy.org/doc/",
           _("Numpy and Scipy documentation")),
-         ('matplotlib', "http://matplotlib.sourceforge.net/contents.html",
+         ('matplotlib', "https://matplotlib.org/contents.html",
           _("Matplotlib documentation")),
          ('PyQt5',
           "http://pyqt.sourceforge.net/Docs/PyQt5/",
@@ -2350,9 +2350,8 @@ def about(self):
             <p>This project is part of a larger effort to promote and
             facilitate the use of Python for scientific and engineering
             software development. The popular Python distributions
-            <a href="http://continuum.io/downloads">Anaconda</a>,
-            <a href="https://winpython.github.io/">WinPython</a> and
-            <a href="http://python-xy.github.io/">Python(x,y)</a>
+            <a href="https://www.anaconda.com/download/">Anaconda</a> and
+            <a href="https://winpython.github.io/">WinPython</a>
             also contribute to this plan.
             <p>Python %s %dbits, Qt %s, %s %s on %s
             <p><small>Most of the icons for the Spyder 2 theme come from the Crystal

spyder/app/start.py

@@ -40,7 +40,7 @@ def send_args_to_spyder(args):
     port = CONF.get('main', 'open_files_port')
 
     # Wait ~50 secs for the server to be up
-    # Taken from http://stackoverflow.com/a/4766598/438386
+    # Taken from https://stackoverflow.com/a/4766598/438386
     for _x in range(200):
         try:
             for arg in args:

spyder/app/tour.py

@@ -84,7 +84,7 @@ def get_tour(index):
     updated accordingly
     """
     sw = SpyderWidgets
-    qtconsole_link = "http://ipython.org/ipython-doc/stable/interactive/qtconsole.html"
+    qtconsole_link = "https://qtconsole.readthedocs.io/en/stable/index.html"
 
     # This test should serve as example of keys to use in the tour frame dics
     test = [{'title': "Welcome to Spyder introduction tour",

spyder/interpreter.py

@@ -129,7 +129,7 @@ def help_replacement(self, text=None, interactive=False):
 Welcome to Python %s!  This is the online help utility.
 
 If this is your first time using Python, you should definitely check out
-the tutorial on the Internet at http://www.python.org/doc/tut/.
+the tutorial on the Internet at https://www.python.org/about/gettingstarted/
 
 Enter the name of any module, keyword, or topic to get help on writing
 Python programs and using Python modules.  To quit this help utility and

spyder/plugins/configdialog.py

@@ -41,7 +41,7 @@
 from spyder.widgets.sourcecode.codeeditor import CodeEditor
 
 
-HDPI_QT_PAGE = "http://doc.qt.io/qt-5/highdpi.html"
+HDPI_QT_PAGE = "https://doc.qt.io/qt-5/highdpi.html"
 
 
 class ConfigAccessMixin(object):

spyder/plugins/editor.py

@@ -256,7 +256,7 @@ def enable_tabwidth_spin(index):
                                'always_remove_trailing_spaces', default=False)
 
         analysis_group = QGroupBox(_("Analysis"))
-        pep_url = '<a href="http://www.python.org/dev/peps/pep-0008/">PEP8</a>'
+        pep_url = '<a href="https://www.python.org/dev/peps/pep-0008">PEP8</a>'
         pep8_label = QLabel(_("<i>(Refer to the {} page)</i>").format(pep_url))
         pep8_label.setOpenExternalLinks(True)
         is_pyflakes = codeanalysis.is_pyflakes_installed()

spyder/utils/codeanalysis.py

@@ -64,9 +64,9 @@ def check_with_pyflakes(source_code, filename=None):
                 results = [(value.args[0], value.lineno)]
         except (ValueError, TypeError):
             # Example of ValueError: file contains invalid \x escape character
-            # (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674797)
+            # (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674797)
             # Example of TypeError: file contains null character
-            # (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674796)
+            # (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674796)
             results = []
         else:
             # Okay, it's syntactically valid.  Now check it.

spyder/utils/external/binaryornot/helpers.py

@@ -49,7 +49,7 @@ def is_binary_string(bytes_to_check):
     """
     Uses a simplified version of the Perl detection algorithm,
     based roughly on Eli Bendersky's translation to Python:
-    http://eli.thegreenplace.net/2011/10/19/perls-guess-if-file-is-text-or-binary-implemented-in-python/
+    https://eli.thegreenplace.net/2011/10/19/perls-guess-if-file-is-text-or-binary-implemented-in-python/
 
     This is biased slightly more in favour of deeming files as text
     files than the Perl algorithm, since all ASCII compatible character

spyder/utils/external/lockfile.py

@@ -42,15 +42,15 @@ def unique():
     import ctypes
     from ctypes import wintypes
 
-    # http://msdn.microsoft.com/en-us/library/windows/desktop/ms684880(v=vs.85).aspx
+    # https://docs.microsoft.com/en-us/windows/desktop/ProcThread/process-security-and-access-rights
     PROCESS_QUERY_INFORMATION = 0x400
 
     # GetExitCodeProcess uses a special exit code to indicate that the
     # process is still running.
     STILL_ACTIVE = 259
 
     def _is_pid_running(pid):
-        """Taken from http://www.madebuild.org/blog/?p=30"""
+        """Taken from https://www.madebuild.org/blog/?p=30"""
         kernel32 = ctypes.windll.kernel32
         handle = kernel32.OpenProcess(PROCESS_QUERY_INFORMATION, 0, pid)
         if handle == 0:

spyder/utils/help/templates/layout.html

@@ -10,7 +10,7 @@
 #}
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
 
@@ -23,7 +23,7 @@
     {% if right_sphinx_version and math_on %}
     {# DON'T try to load MathJax from the net. It's slow and sometimes gives
        errors. See this thread for more info:
-       http://tex.stackexchange.com/questions/2692/comparing-mathjax-and-mathml
+       https://tex.stackexchange.com/questions/2692/comparing-mathjax-and-mathml
     #}
     <script type="text/javascript" 
     src="file:///{{mathjax_path}}/MathJax.js?config=TeX-AMS-MML_SVG-full">

spyder/utils/help/templates/usage.html

@@ -9,7 +9,7 @@
 #}
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
 

spyder/utils/help/templates/warning.html

@@ -10,7 +10,7 @@
 #}
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
 

spyder/utils/help/tutorial.rst

@@ -11,7 +11,7 @@ effectively develop the programs you need as a scientist.
 
 
 This tutorial is authored by
-`Hans Fangohr <http://www.southampton.ac.uk/~fangohr>`__ from the
+`Hans Fangohr <https://fangohr.github.io/>`__ from the
 University of Southampton (UK) (see `historical note`_ for more
 detail).
 
@@ -307,7 +307,7 @@ shows that we are using the ``console`` -- basically a normal Python
 console session (with some added functionality from Spyder).
 
 Instead, we would like to use an *Interactive Python* console, short *IPython*
-from the `IPython project <http://www.ipython.org>`__. To do this, select
+from the `IPython project <https://ipython.org>`__. To do this, select
 ``Consoles > Open an IPython Console``.
 
 You should see in the consolse window a new shell appearing, and the
@@ -316,7 +316,7 @@ IPython prompt ``In [1]:`` should be displayed.
 Reset the name space
 --------------------
 
-The `name space <http://bytebaker.com/2008/07/30/python-namespaces/>`__
+The `name space <https://bytebaker.com/2008/07/30/python-namespaces/>`__
 (i.e. the collection of objects defined in the console at any given time)
 can be cleared in IPython using the ``%reset`` command. Type ``%reset``
 and press return, then confirm with ``y``::
@@ -363,7 +363,7 @@ Strive for PEP8 Compliance
 In addition to the syntax that is enforced by the Python programming
 language, there are additional conventions regarding the layout of
 the source code, in particular the `Style Guide for Python source code 
-<http://www.python.org/dev/peps/pep-0008/>`__ known as "PEP8". By
+<https://www.python.org/dev/peps/pep-0008/>`__ known as "PEP8". By
 following this guide and writing code in the same style as almost all
 Python programmers do, it becomes easier to read, and thus easier to
 debug and re-use -- both for the original author and others.
@@ -399,7 +399,7 @@ Automatic Symbolic Python
 
 Through ``Preferences > IPython console > Advanced Settings > Use
 symbolic math`` we can activate IPython's SYMbolic PYthon (sympy) mode that is
-provided by the `sympy <http://sympy.org>`__ module. This mode
+provided by the `sympy <https://www.sympy.org/>`__ module. This mode
 in Spyder allows nicely rendered mathematical output (LaTeX style) and also
 imports some sympy objects automatically when the IPython console starts, and
 reports what it has done.
@@ -940,11 +940,11 @@ Historical note
 ###############
 
 This tutorial is based on `notes
-<http://www.southampton.ac.uk/~fangohr/blog/spyder-the-python-ide.html>`__
-by `Hans Fangohr <http://www.southampton.ac.uk/~fangohr>`__, that are
-used at the `University of Southampton <http://www.soton.ac.uk>`__ to
+<https://fangohr.github.io/blog/spyder-the-python-ide-spyder-23.html>`__
+by `Hans Fangohr <https://fangohr.github.io/>`__, that are
+used at the `University of Southampton <https://www.southampton.ac.uk/>`__ to
 `teach Python for computational modelling
-<http://www.southampton.ac.uk/~fangohr/teaching/python.html>`__ to
+<https://www.southampton.ac.uk/~fangohr/teaching/python.html>`__ to
 undergraduate engineers and postgraduate PhD students for the
-`Next Generation Computational Modelling <http://ngcm.soton.ac.uk>`__
+`Next Generation Computational Modelling <http://www.ngcm.soton.ac.uk/>`__
 doctoral training centre.

spyder/utils/introspection/fallback_plugin.py

@@ -294,7 +294,7 @@ def _listdir(root):
 
 def _complete_path(path=None):
     """Perform completion of filesystem path.
-    http://stackoverflow.com/questions/5637124/tab-completion-in-pythons-raw-input
+    https://stackoverflow.com/questions/5637124/tab-completion-in-pythons-raw-input
     """
     if not path:
         return _listdir('.')

spyder/utils/introspection/rope_patch.py

@@ -11,13 +11,13 @@
     cx_Freeze
 
 [2] For better performance, see this thread:
-    http://groups.google.com/group/rope-dev/browse_thread/thread/57de5731f202537a
+    https://groups.google.com/forum/#!topic/rope-dev/V95XMfICU3o
 
 [3] To avoid considering folders without __init__.py as Python packages, thus
     avoiding side effects as non-working introspection features on a Python
     module or package when a folder in current directory has the same name.
     See this thread:
-    http://groups.google.com/group/rope-dev/browse_thread/thread/924c4b5a6268e618
+    https://groups.google.com/forum/#!topic/rope-dev/kkxLWmJo5hg
 
 [4] To avoid rope adding a 2 spaces indent to every docstring it gets, because
     it breaks the work of Sphinx on the Help plugin. Also, to better

spyder/utils/ipython/templates/blank.html

@@ -9,7 +9,7 @@
 -->
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
 

spyder/utils/ipython/templates/kernel_error.html

@@ -9,7 +9,7 @@
 -->
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
 

spyder/utils/ipython/templates/loading.html

@@ -9,7 +9,7 @@
 -->
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html>
 
@@ -18,7 +18,7 @@
   <link rel="stylesheet" href="file:///${css_path}/default.css" type="text/css"/>
 
   <!-- Generate throbber animation using an sprites png and javascript
-       Taken from http://preloaders.net
+       Taken from https://icons8.com/preloaders/
   -->
   <script type="text/javascript">
     var cSpeed=6;

spyder/utils/programs.py

@@ -279,7 +279,7 @@ def run_python_script_in_terminal(fname, wdir, args, interact,
         # Command line and cwd have to be converted to the filesystem
         # encoding before passing them to subprocess, but only for
         # Python 2.
-        # See http://bugs.python.org/issue1759845#msg74142 and Issue 1856
+        # See https://bugs.python.org/issue1759845#msg74142 and Issue 1856
         if PY2:
             cmd = encoding.to_fs_from_unicode(cmd)
             wdir = encoding.to_fs_from_unicode(wdir)

spyder/utils/sourcecode.py

@@ -139,7 +139,7 @@ def path_components(path):
     Return the individual components of a given file path
     string (for the local operating system).
 
-    Taken from http://stackoverflow.com/q/21498939/438386
+    Taken from https://stackoverflow.com/q/21498939/438386
     """
     components = []
     # The loop guarantees that the returned components can be
@@ -159,7 +159,7 @@ def differentiate_prefix(path_components0, path_components1):
     """
     Return the differentiated prefix of the given two iterables. 
      
-    Taken from http://stackoverflow.com/q/21498939/438386
+    Taken from https://stackoverflow.com/q/21498939/438386
     """
     longest_prefix = []
     root_comparison = False

spyder/utils/system.py

@@ -31,7 +31,7 @@ class MemoryStatus(Structure):
     memorystatus = MemoryStatus()
     # MSDN documetation states that dwLength must be set to MemoryStatus
     # size before calling GlobalMemoryStatusEx
-    # http://msdn.microsoft.com/en-us/library/aa366770(v=vs.85)
+    # https://msdn.microsoft.com/en-us/library/aa366770(v=vs.85)
     memorystatus.dwLength = sizeof(memorystatus)
     windll.kernel32.GlobalMemoryStatusEx(byref(memorystatus))
     return float(memorystatus.dwMemoryLoad)
@@ -40,7 +40,7 @@ def psutil_phymem_usage():
     """
     Return physical memory usage (float)
     Requires the cross-platform psutil (>=v0.3) library
-    (http://code.google.com/p/psutil/)
+    (https://github.com/giampaolo/psutil)
     """
     import psutil
     # This is needed to avoid a deprecation warning error with

spyder/widgets/browser.py

@@ -365,7 +365,7 @@ def test():
     app = qapplication(test_time=8)
     widget = WebBrowser()
     widget.show()
-    widget.set_home_url('http://www.google.com/')
+    widget.set_home_url('https://www.google.com/')
     widget.go_home()
     sys.exit(app.exec_())