Use distro module instead of platform

Per rhbz#1705262
zmiklank · May 13, 2019 · 74d2944 · 74d2944
1 parent 5e5ddb5
commit 74d2944
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git 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/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
+distro
 jinja2
 six
 pyyaml
diff --git a/rpm/distgen.spec.dg b/rpm/distgen.spec.dg
@@ -13,11 +13,20 @@ License:    GPLv2+
 URL:        https://github.com/devexp-db/distgen
 BuildArch:  noarch
 
-%global both_requires %{pypkg}-jinja2, %{pypkg}-six, %{?fedora:%{pypkg}-}PyYAML
-
-Requires:      %both_requires
-BuildRequires: %{pypkg}-setuptools %{pypkg}-devel %{?fedora:%{pypkg}-}pytest %both_requires
-BuildRequires: %{pypkg}-pytest-catchlog %pypkg-mock
+Requires: %{pypkg}-jinja2
+Requires: %{pypkg}-distro
+Requires: %{?fedora:%{pypkg}-}PyYAML
+Requires: %{pypkg}-six
+
+BuildRequires: %{pypkg}-devel
+BuildRequires: %{pypkg}-distro
+BuildRequires: %{pypkg}-jinja2
+BuildRequires: %pypkg-mock
+BuildRequires: %{?fedora:%{pypkg}-}pytest
+BuildRequires: %{pypkg}-pytest-catchlog
+BuildRequires: %{?fedora:%{pypkg}-}PyYAML
+BuildRequires: %{pypkg}-setuptools
+BuildRequires: %{pypkg}-six
 
 Source0: https://pypi.org/packages/source/d/%name/%name-%version.tar.gz
 

diff --git 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 @@ def test_rpm(self, pdist, sp_co, distro, version, name, cversion, arch):
         )
 
 
-    @patch('platform.dist')
+    @patch('distro.linux_distribution')
     def test_others(self, dist):
         dist.return_value = ('debian', 1, 'something')
         assert detect_default_distro() == None
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    distro
     jinja2
     six
     pyyaml