Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Rename to macOS #1516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Rename to macOS #1516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 2 blogs/tests/psf_feed_example.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ Along the way it was remarked that the <a class="reference external" href="ht
<div class="section" id="virtualenv-inclusion">
<h4>
<tt class="docutils literal">virtualenv</tt> Inclusion</h4>
In about two minutes, discussion on PEP <a class="reference external" href="http://www.python.org/dev/peps/pep-0405/">405</a> came and went. Carl Meyer mentioned that a reference implementation is available and is working pretty well. A look from the OSX maintainers would be beneficial, and both Ned Deily and Ronald Oussoren were in attendance. It seemed like one of the only things left in terms of the PEP was to find someone to make a declaration on it, and Thomas Wouters put his name out there if Nick Coghlan wasn't going to do t (update: Nick will be the PEP czar).</div>
In about two minutes, discussion on PEP <a class="reference external" href="http://www.python.org/dev/peps/pep-0405/">405</a> came and went. Carl Meyer mentioned that a reference implementation is available and is working pretty well. A look from the macOS maintainers would be beneficial, and both Ned Deily and Ronald Oussoren were in attendance. It seemed like one of the only things left in terms of the PEP was to find someone to make a declaration on it, and Thomas Wouters put his name out there if Nick Coghlan wasn't going to do t (update: Nick will be the PEP czar).</div>
<br />
<div class="section" id="pep-397-inclusion">
<h4>
Expand Down
2 changes: 1 addition & 1 deletion 2 docs/source/administration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions 6 downloads/tests/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')


Expand Down Expand Up @@ -52,8 +52,8 @@ def setUp(self):
self.release_275_osx = ReleaseFile.objects.create(
os=self.osx,
release=self.release_275,
name='Mac OSX 64-bit/32-bit',
description='Mac OS X 10.6 and later',
name='macOS 64-bit/32-bit',
description='macOS 10.6 and later',
url='ftp/python/2.7.5/python-2.7.5-macosx10.6.dmg',
)

Expand Down
2 changes: 1 addition & 1 deletion 2 downloads/tests/test_models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
6 changes: 3 additions & 3 deletions 6 fixtures/boxes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/mac-osx/\">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/mac-osx/\">macOS</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"
}
},
Expand Down Expand Up @@ -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-mac-osx\" 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"
}
},
Expand Down
2 changes: 1 addition & 1 deletion 2 fixtures/sitetree_menus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@
"model": "sitetree.treeitem",
"pk": 20,
"fields": {
"title": "Mac OS X",
"title": "macOS",
"hint": "",
"url": "/downloads/mac-osx/",
"urlaspattern": false,
Expand Down
2 changes: 1 addition & 1 deletion 2 static/sass/_layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,7 +920,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>
Expand Down
2 changes: 1 addition & 1 deletion 2 static/sass/mq.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2118,7 +2118,7 @@ html[xmlns] .slides { display: block; }
<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>
Expand Down
2 changes: 1 addition & 1 deletion 2 static/sass/no-mq.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1809,7 +1809,7 @@ a.button {
<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>
Expand Down
2 changes: 1 addition & 1 deletion 2 templates/community/microbit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ <h2>Links</h2>
<li>In addition to the Python editor built into the
<a href="https://microbit.org/">official website</a>, there is
a native editor <a href="https://codewith.mu/">called Mu</a> (that
works on Windows, OSX, Linux and Raspberry Pi). There is also an
works on Windows, macOS, Linux and Raspberry Pi). There is also an
editor
<a href="https://github.com/ntoll/python-native-editor">for
ChromeOS</a>.</li>
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.