summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-06-24 20:20:18 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-06-24 20:20:18 (GMT)
commitab88803a8addf36ae3fc7e9270ebbed869f7f191 (patch)
tree92e96ed10dd4a43130abe55531e3e82e79295a42
parent488fccfaaf0afb432c9131ad40eb81e517316fbc (diff)
downloadcpython-ab88803a8addf36ae3fc7e9270ebbed869f7f191.zip
cpython-ab88803a8addf36ae3fc7e9270ebbed869f7f191.tar.gz
cpython-ab88803a8addf36ae3fc7e9270ebbed869f7f191.tar.bz2
Support Mageia Linux in the platform module.
-rwxr-xr-xLib/platform.py2
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index 6255353..3cb7c3e 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -260,7 +260,7 @@ _release_version = re.compile(r'([^0-9]+)'
_supported_dists = (
'SuSE', 'debian', 'fedora', 'redhat', 'centos',
'mandrake', 'mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo',
- 'UnitedLinux', 'turbolinux', 'arch')
+ 'UnitedLinux', 'turbolinux', 'arch', 'mageia')
def _parse_release_file(firstline):
diff --git a/Misc/NEWS b/Misc/NEWS
index 98cb258..3591b38 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -59,6 +59,8 @@ Core and Builtins
Library
-------
+- Support Mageia Linux in the platform module.
+
- Issue #11678: Support Arch linux in the platform module.
- Issue #15118: Change return value of os.uname() and os.times() from