diff options
| author | Georg Brandl <georg@python.org> | 2014-11-17 19:36:34 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-11-17 19:36:34 +0100 |
| commit | 921381e3b4097b44dcd4ab24eef69e8e87a321bf (patch) | |
| tree | 4b00814cbbcff029aef7e9853af5d68911af09b8 | |
| parent | a72a53db9bd19f6d96fc1132246c8ee2bec4432e (diff) | |
| parent | 26b7c23525855f5ea3c7951a98d4dfea1168bbd4 (diff) | |
| download | sphinx-921381e3b4097b44dcd4ab24eef69e8e87a321bf.tar.gz | |
merge with stable
| -rw-r--r-- | sphinx/environment.py | 4 | ||||
| -rw-r--r-- | tests/test_build_html.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sphinx/environment.py b/sphinx/environment.py index f0021fd3..c3d67d73 100644 --- a/sphinx/environment.py +++ b/sphinx/environment.py @@ -63,8 +63,8 @@ class ElementLookupError(Exception): default_settings = { 'embed_stylesheet': False, 'cloak_email_addresses': True, - 'pep_base_url': 'http://www.python.org/dev/peps/', - 'rfc_base_url': 'http://tools.ietf.org/html/', + 'pep_base_url': 'https://www.python.org/dev/peps/', + 'rfc_base_url': 'https://tools.ietf.org/html/', 'input_encoding': 'utf-8-sig', 'doctitle_xform': False, 'sectsubtitle_xform': False, diff --git a/tests/test_build_html.py b/tests/test_build_html.py index 63bdeff1..c03465d5 100644 --- a/tests/test_build_html.py +++ b/tests/test_build_html.py @@ -138,14 +138,14 @@ HTML_XPATH = { (".//li/code/span[@class='pre']", '^a/$'), (".//li/code/em/span[@class='pre']", '^varpart$'), (".//li/code/em/span[@class='pre']", '^i$'), - (".//a[@href='http://www.python.org/dev/peps/pep-0008']" + (".//a[@href='https://www.python.org/dev/peps/pep-0008']" "[@class='pep reference external']/strong", 'PEP 8'), - (".//a[@href='http://www.python.org/dev/peps/pep-0008']" + (".//a[@href='https://www.python.org/dev/peps/pep-0008']" "[@class='pep reference external']/strong", 'Python Enhancement Proposal #8'), - (".//a[@href='http://tools.ietf.org/html/rfc1.html']" + (".//a[@href='https://tools.ietf.org/html/rfc1.html']" "[@class='rfc reference external']/strong", 'RFC 1'), - (".//a[@href='http://tools.ietf.org/html/rfc1.html']" + (".//a[@href='https://tools.ietf.org/html/rfc1.html']" "[@class='rfc reference external']/strong", 'Request for Comments #1'), (".//a[@href='objects.html#envvar-HOME']" "[@class='reference internal']/code/span[@class='pre']", 'HOME'), |