From 0ede6d839982c2bc2e0f79da6ac3aafa02f04f76 Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Thu, 2 May 2019 01:04:20 +0200
Subject: [PATCH] Use distro module instead of platform
Per rhbz#1705262
---
distgen/distro_version.py | 4 ++--
tests/unittests/test_distro_detection.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/distgen/distro_version.py b/distgen/distro_version.py
index 421c4be..6208216 100644
--- a/distgen/distro_version.py
+++ b/distgen/distro_version.py
@@ -1,9 +1,9 @@
-import platform
+import distro
import subprocess
def detect_default_distro():
- os, version, name = platform.dist()
+ os, version, name = distro.linux_distribution(full_distribution_name=True)
os = os.lower()
if os == 'fedora':
diff --git a/tests/unittests/test_distro_detection.py b/tests/unittests/test_distro_detection.py
index 27966d3..842a5fb 100644
--- a/tests/unittests/test_distro_detection.py
+++ b/tests/unittests/test_distro_detection.py
@@ -15,7 +15,7 @@ class TestDistroDetection(object):
('rhel', 7, 'sth', 7),
])
@patch('subprocess.check_output')
- @patch('platform.dist')
+ @patch('distro.linux_distribution')
def test_rpm(self, pdist, sp_co, distro, version, name, cversion, arch):
sp_co.return_value = arch
pdist.return_value = (distro, version, name)
@@ -25,7 +25,7 @@ class TestDistroDetection(object):
)
- @patch('platform.dist')
+ @patch('distro.linux_distribution')
def test_others(self, dist):
dist.return_value = ('debian', 1, 'something')
assert detect_default_distro() == None
--
2.20.1