summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCHI Cheng <cloudream@gmail.com>2018-12-27 20:48:37 +1100
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2018-12-27 10:56:19 +0100
commit190aa594477a62a43ca78c41d2d0af47dd6ccbba (patch)
treee8fb810de60a12385b04e9b610a47672a08710fa
parent2ea1e0e58d3e0afffda4308a45e6c96693f3a7c9 (diff)
downloaddjango-190aa594477a62a43ca78c41d2d0af47dd6ccbba.tar.gz
[1.11.x] Fixed broken links to PyYAML page.
Backport of b7dbd5ff68bb9d2235ca081c0bd0b8baa65f8c77 from master.
-rw-r--r--docs/howto/initial-data.txt2
-rw-r--r--docs/topics/serialization.txt2
-rw-r--r--tests/timezones/tests.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/howto/initial-data.txt b/docs/howto/initial-data.txt
index 5945073889..923157452b 100644
--- a/docs/howto/initial-data.txt
+++ b/docs/howto/initial-data.txt
@@ -19,7 +19,7 @@ Or, you can write fixtures by hand; fixtures can be written as JSON, XML or YAML
</topics/serialization>` has more details about each of these supported
:ref:`serialization formats <serialization-formats>`.
-.. _PyYAML: http://www.pyyaml.org/
+.. _PyYAML: https://pyyaml.org/
As an example, though, here's what a fixture for a simple ``Person`` model might
look like in JSON:
diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt
index 5db5e656ec..f6d78b40f0 100644
--- a/docs/topics/serialization.txt
+++ b/docs/topics/serialization.txt
@@ -165,7 +165,7 @@ Identifier Information
========== ==============================================================
.. _json: http://json.org/
-.. _PyYAML: http://www.pyyaml.org/
+.. _PyYAML: https://pyyaml.org/
XML
---
diff --git a/tests/timezones/tests.py b/tests/timezones/tests.py
index 8f9bd23241..49247294f8 100644
--- a/tests/timezones/tests.py
+++ b/tests/timezones/tests.py
@@ -664,7 +664,7 @@ class SerializationTests(SimpleTestCase):
# - JSON supports only milliseconds, microseconds will be truncated.
# - PyYAML dumps the UTC offset correctly for timezone-aware datetimes,
# but when it loads this representation, it subtracts the offset and
- # returns a naive datetime object in UTC (http://pyyaml.org/ticket/202).
+ # returns a naive datetime object in UTC. See ticket #18867.
# Tests are adapted to take these quirks into account.
def assert_python_contains_datetime(self, objects, dt):