From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sun, 24 Jun 2012 20:20:18 +0000 (+0200)
Subject: Support Mageia Linux in the platform module.
X-Git-Tag: v3.3.0b1~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab88803a8addf36ae3fc7e9270ebbed869f7f191;p=thirdparty%2FPython%2Fcpython.git

Support Mageia Linux in the platform module.
---

diff --git a/Lib/platform.py b/Lib/platform.py
index 62553538566d..3cb7c3e5ee4b 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 98cb258f2bc4..3591b385ebe3 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