1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
# DP: Use /etc/lsb-release to identify the platform.
Index: b/Lib/platform.py
===================================================================
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -267,7 +267,7 @@ _release_version = re.compile(r'([^0-9]+
_supported_dists = (
'SuSE', 'debian', 'fedora', 'redhat', 'centos',
'mandrake', 'mandriva', 'rocks', 'slackware', 'yellowdog', 'gentoo',
- 'UnitedLinux', 'turbolinux', 'arch', 'mageia')
+ 'UnitedLinux', 'turbolinux', 'arch', 'mageia', 'Ubuntu')
def _parse_release_file(firstline):
@@ -296,6 +296,10 @@ def _parse_release_file(firstline):
id = l[1]
return '', version, id
+_distributor_id_file_re = re.compile("(?:DISTRIB_ID\s*=)\s*(.*)", re.I)
+_release_file_re = re.compile("(?:DISTRIB_RELEASE\s*=)\s*(.*)", re.I)
+_codename_file_re = re.compile("(?:DISTRIB_CODENAME\s*=)\s*(.*)", re.I)
+
def linux_distribution(distname='', version='', id='',
supported_dists=_supported_dists,
@@ -328,6 +332,25 @@ def _linux_distribution(distname, versio
args given as parameters.
"""
+ # check for the Debian/Ubuntu /etc/lsb-release file first, needed so
+ # that the distribution doesn't get identified as Debian.
+ try:
+ with open("/etc/lsb-release", "r") as etclsbrel:
+ for line in etclsbrel:
+ m = _distributor_id_file_re.search(line)
+ if m:
+ _u_distname = m.group(1).strip()
+ m = _release_file_re.search(line)
+ if m:
+ _u_version = m.group(1).strip()
+ m = _codename_file_re.search(line)
+ if m:
+ _u_id = m.group(1).strip()
+ if _u_distname and _u_version:
+ return (_u_distname, _u_version, _u_id)
+ except (EnvironmentError, UnboundLocalError):
+ pass
+
try:
etc = os.listdir(_UNIXCONFDIR)
except OSError:
Index: b/Lib/test/test_platform.py
===================================================================
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -349,6 +349,8 @@ class PlatformTest(unittest.TestCase):
self.assertEqual(version, '19')
self.assertEqual(distid, 'Schr\xf6dinger\u2019s Cat')
+ # we know we are Debian/Ubuntu
+ test_linux_distribution_encoding.skip = True
class DeprecationTest(unittest.TestCase):
|
