s/Mac OS X/macOS/ (#1829)

The database on python.org is already updated.

Author: ambv

docs/source/administration.rst

@@ -22,7 +22,7 @@ Here is an example of what that looks like on the site.
 .. image:: _images/supernav-example.png
     :alt: Example Supernav image
 
-The sub-nav items on the left are simply nested :ref:`navigation` links in SiteTree relative to the 'Download' item in the tree.  The larger *Download for Mac OSX* box however is what we refer to as the *supernav*.
+The sub-nav items on the left are simply nested :ref:`navigation` links in SiteTree relative to the 'Download' item in the tree.  The larger *Download for macOS* box however is what we refer to as the *supernav*.
 
 Most supernavs are updated automatically based on the underlying Django application content using signals.
 By convention the application will have a template named ``supernav.html``. For example, upon saving any published :ref:`Release <downloads>` a Django signal is fired to update the ``supernav-python-downloads`` box with the most current Python2 and Python3 releases.  In this case the markup is structured in a way to allow for the automatic OS detection Javascript to show the user the appropriate download links for the OS they are browsing with.

downloads/models.py

@@ -252,7 +252,7 @@ def purge_fastly_download_pages(sender, instance, **kwargs):
         purge_url('/downloads/')
         purge_url('/downloads/latest/python2/')
         purge_url('/downloads/latest/python3/')
-        purge_url('/downloads/mac-osx/')
+        purge_url('/downloads/macos/')
         purge_url('/downloads/source/')
         purge_url('/downloads/windows/')
         if instance.get_version() is not None:

downloads/tests/base.py

@@ -13,7 +13,7 @@ class DownloadMixin:
     def setUpClass(cls):
         super().setUpClass()
         cls.windows, _ = OS.objects.get_or_create(name='Windows')
-        cls.osx, _ = OS.objects.get_or_create(name='Mac OSX')
+        cls.osx, _ = OS.objects.get_or_create(name='macOS')
         cls.linux, _ = OS.objects.get_or_create(name='Linux')
 
 

downloads/tests/test_models.py

@@ -5,7 +5,7 @@
 class DownloadModelTests(BaseDownloadTests):
 
     def test_stringification(self):
-        self.assertEqual(str(self.osx), 'Mac OSX')
+        self.assertEqual(str(self.osx), 'macOS')
         self.assertEqual(str(self.release_275), 'Python 2.7.5')
 
     def test_published(self):

fixtures/boxes.json

@@ -332,14 +332,14 @@
 {
     "fields": {
         "label": "download-banner",
-        "content": "<p>Looking for Python with a different OS? Python for <a href=\"/downloads/windows/\">Windows</a>, <a href=\"/downloads/source/\">Linux/UNIX</a>, <a href=\"/downloads/mac-osx/\">Mac OS X</a>, <a href=\"/download/other/\">Other</a></p>\r\n<p style=\"margin-top: 0.35em\">Want to help test development versions of Python?  <a href=\"/download/pre-releases/\">Pre-releases</a></p>\r\n<p style=\"margin-top: 0.35em\">Looking for Python 2.7? See below for specific releases</p>",
+        "content": "<p>Looking for Python with a different OS? Python for <a href=\"/downloads/windows/\">Windows</a>, <a href=\"/downloads/source/\">Linux/UNIX</a>, <a href=\"/downloads/macos/\">macOS</a>, <a href=\"/download/other/\">Other</a></p>\r\n<p style=\"margin-top: 0.35em\">Want to help test development versions of Python?  <a href=\"/download/pre-releases/\">Pre-releases</a></p>\r\n<p style=\"margin-top: 0.35em\">Looking for Python 2.7? See below for specific releases</p>",
         "content_markup_type": "html"
     }
 },
 {
     "fields": {
         "label": "download-dev",
-        "content": "<h2>Information about specific ports, and developer info</h2>\r\n\r\n<ul>\r\n   <li><a href=\"/downloads/windows/\">Windows (and DOS)</a></li>\r\n   <li><a href=\"/downloads/mac-osx/\">Macintosh</a></li>\r\n   <li><a href=\"/download/other/\">Other platforms</a></li>\r\n   <li><a href=\"/downloads/source/\">Source</a></li>\r\n   <li><a href=\"/dev/\">Python Developer's Guide</a></li>\r\n   <li><a href=\"http://bugs.python.org\">Python Issue Tracker</a></li>\r\n</ul>",
+        "content": "<h2>Information about specific ports, and developer info</h2>\r\n\r\n<ul>\r\n   <li><a href=\"/downloads/windows/\">Windows (and DOS)</a></li>\r\n   <li><a href=\"/downloads/macos/\">Macintosh</a></li>\r\n   <li><a href=\"/download/other/\">Other platforms</a></li>\r\n   <li><a href=\"/downloads/source/\">Source</a></li>\r\n   <li><a href=\"/dev/\">Python Developer's Guide</a></li>\r\n   <li><a href=\"http://bugs.python.org\">Python Issue Tracker</a></li>\r\n</ul>",
         "content_markup_type": "html"
     }
 },
@@ -374,7 +374,7 @@
 {
     "fields": {
         "label": "supernav-python-downloads",
-        "content": "<!-- download supernav from templates/downloads/supernav.html -->\n<li class=\"tier-2 super-navigation\">\n    \n    <div class=\"download-os-mac-osx\" style=\"display: none;\">\n        \n        <h4>Download for Mac OS X</h4>\n        \n        <p>\n            <a class=\"button\" href=\"https://www.python.org/ftp/python/3.5.2/python-3.5.2-macosx10.6.pkg\">Python 3.5.2</a>\n            <a class=\"button\" href=\"https://www.python.org/ftp/python/2.7.12/python-2.7.12-macosx10.6.pkg\">Python 2.7.12</a>\n        </p>\n        \n        <p>Not the OS you are looking for? Python can be used on many operating systems and environments. <a href=\"/downloads/\">View the full list of downloads</a>.</p>\n    </div>\n    \n    <div class=\"download-os-source\" style=\"display: none;\">\n        \n        <h3>Python Source</h3>\n        \n        <p>\n            <a class=\"button\" href=\"https://www.python.org/ftp/python/3.5.2/Python-3.5.2.tar.xz\">Python 3.5.2</a>\n            <a class=\"button\" href=\"https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tar.xz\">Python 2.7.12</a>\n        </p>\n        \n        <p>Not the OS you are looking for? Python can be used on many operating systems and environments. <a href=\"/downloads/\">View the full list of downloads</a>.</p>\n    </div>\n    \n    <div class=\"download-os-windows\" style=\"display: none;\">\n        \n        <h4>Download for Windows</h4>\n        \n        <p>\n            <a class=\"button\" href=\"https://www.python.org/ftp/python/3.5.2/python-3.5.2.exe\">Python 3.5.2</a>\n            <a class=\"button\" href=\"https://www.python.org/ftp/python/2.7.12/python-2.7.12.msi\">Python 2.7.12</a>\n        </p>\n        <p><strong>Note that Python 3.5+ <em>cannot</em> be used on Windows XP or earlier.</strong></p>\n        <p>Not the OS you are looking for? Python can be used on many operating systems and environments. <a href=\"/downloads/\">View the full list of downloads</a>.</p>\n    </div>\n    \n    <div class=\"download-unknown\">\n        <h4>Download Python for Any OS</h4>\n        <p>Python can be used on many operating systems and environments.</p>\n        <p>\n            <a class=\"button\" href=\"/downloads/operating-systems/\">View the full list of downloads</a>\n        </p>\n    </div>\n</li>\n",
+        "content": "<!-- download supernav from templates/downloads/supernav.html -->\n<li class=\"tier-2 super-navigation\">\n    \n    <div class=\"download-os-macos\" style=\"display: none;\">\n        \n        <h4>Download for macOS</h4>\n        \n        <p>\n            <a class=\"button\" href=\"https://www.python.org/ftp/python/3.5.2/python-3.5.2-macosx10.6.pkg\">Python 3.5.2</a>\n            <a class=\"button\" href=\"https://www.python.org/ftp/python/2.7.12/python-2.7.12-macosx10.6.pkg\">Python 2.7.12</a>\n        </p>\n        \n        <p>Not the OS you are looking for? Python can be used on many operating systems and environments. <a href=\"/downloads/\">View the full list of downloads</a>.</p>\n    </div>\n    \n    <div class=\"download-os-source\" style=\"display: none;\">\n        \n        <h3>Python Source</h3>\n        \n        <p>\n            <a class=\"button\" href=\"https://www.python.org/ftp/python/3.5.2/Python-3.5.2.tar.xz\">Python 3.5.2</a>\n            <a class=\"button\" href=\"https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tar.xz\">Python 2.7.12</a>\n        </p>\n        \n        <p>Not the OS you are looking for? Python can be used on many operating systems and environments. <a href=\"/downloads/\">View the full list of downloads</a>.</p>\n    </div>\n    \n    <div class=\"download-os-windows\" style=\"display: none;\">\n        \n        <h4>Download for Windows</h4>\n        \n        <p>\n            <a class=\"button\" href=\"https://www.python.org/ftp/python/3.5.2/python-3.5.2.exe\">Python 3.5.2</a>\n            <a class=\"button\" href=\"https://www.python.org/ftp/python/2.7.12/python-2.7.12.msi\">Python 2.7.12</a>\n        </p>\n        <p><strong>Note that Python 3.5+ <em>cannot</em> be used on Windows XP or earlier.</strong></p>\n        <p>Not the OS you are looking for? Python can be used on many operating systems and environments. <a href=\"/downloads/\">View the full list of downloads</a>.</p>\n    </div>\n    \n    <div class=\"download-unknown\">\n        <h4>Download Python for Any OS</h4>\n        <p>Python can be used on many operating systems and environments.</p>\n        <p>\n            <a class=\"button\" href=\"/downloads/operating-systems/\">View the full list of downloads</a>\n        </p>\n    </div>\n</li>\n",
         "content_markup_type": "html"
     }
 },

fixtures/sitetree_menus.json

@@ -419,9 +419,9 @@
     "model": "sitetree.treeitem",
     "pk": 20,
     "fields": {
-        "title": "Mac OS X",
+        "title": "macOS",
         "hint": "",
-        "url": "/downloads/mac-osx/",
+        "url": "/downloads/macos/",
         "urlaspattern": false,
         "tree": 1,
         "hidden": false,

pydotorg/urls.py

@@ -27,7 +27,7 @@
     # Redirect old download links to new downloads pages
     url(r'^download/$', RedirectView.as_view(url='https://www.python.org/downloads/', permanent=True)),
     url(r'^download/source/$', RedirectView.as_view(url='https://www.python.org/downloads/source/', permanent=True)),
-    url(r'^download/mac/$', RedirectView.as_view(url='https://www.python.org/downloads/mac-osx/', permanent=True)),
+    url(r'^download/mac/$', RedirectView.as_view(url='https://www.python.org/downloads/macos/', permanent=True)),
     url(r'^download/windows/$', RedirectView.as_view(url='https://www.python.org/downloads/windows/', permanent=True)),
 
     # duplicated downloads to getit to bypass China's firewall. See

static/js/script.js

@@ -89,7 +89,7 @@ function on_resize_orientationchange() {
                     }
                     if (navigator.appVersion.indexOf("Mac")!=-1) {
                         $('.download-unknown').hide();
-                        $('.download-os-mac-osx').show();
+                        $('.download-os-macos').show();
                     }
                     if (navigator.appVersion.indexOf("X11")!=-1) {
                         $('.download-unknown').hide();

static/sass/_layout.scss

@@ -937,7 +937,7 @@
         <ul class="subnav menu" role="menu" aria-hidden="true">
             <li class="tier-2 element-1" role="treeitem"><a href="#">Releases</a></li>
             <li class="super-navigation">
-                <h2>Download for Mac OSX</h2>
+                <h2>Download for macOS</h2>
                 <p>Not the system you are looking for? Python can be used on 21 different operating systems and environments. <a href="#">View the full list</a>.
                 </p><p>
                     <a class="button">Python 3.3.0</a>