From 3edbe8484cdf4a3cb9d7215e20fa9e5619ab9140 Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Tue, 26 Jul 2022 17:42:19 +1000
Subject: [PATCH] Add python2 and python3 return values

The generic translation rules
 def openstack_prefix_tr(mod):
 def rdo_horizon_plugins_tr(mod):
 def suse_horizon_plugins_tr(mod):

Only have return values for pyvers=py, Update the rules to return the
same pkg regardless of pyversion.

This way:
for pyver in py py2 py3 ; do
   pymod2pkg --dist xx --pyver $pyver Tempest
done

returns openstack-tempest for all python versions

Change-Id: I73a49916e2b2898cb31d8cfd68e25b94d39b1934
---
 pymod2pkg/__init__.py | 6 +++---
 tests.py              | 9 ++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pymod2pkg/__init__.py b/pymod2pkg/__init__.py
index d37e124..a03f725 100644
--- a/pymod2pkg/__init__.py
+++ b/pymod2pkg/__init__.py
@@ -108,19 +108,19 @@ def default_suse_tr(mod):
 
 def openstack_prefix_tr(mod):
     pkg = 'openstack-' + mod.lower()
-    return (pkg, '', '')
+    return (pkg, pkg, pkg)
 
 
 def rdo_horizon_plugins_tr(mod):
     mod = mod.replace('dashboard', 'ui')
     pkg = 'openstack-' + mod
-    return (pkg, '', '')
+    return (pkg, pkg, pkg)
 
 
 def suse_horizon_plugins_tr(mod):
     mod = mod.replace('dashboard', 'ui')
     pkg = 'openstack-horizon-plugin-' + mod
-    return (pkg, '', '')
+    return (pkg, pkg, pkg)
 
 
 def rdo_xstatic_tr(mod):
diff --git a/tests.py b/tests.py
index bc4e100..61aa4b1 100644
--- a/tests.py
+++ b/tests.py
@@ -132,7 +132,8 @@ class Pymod2PkgTests(unittest.TestCase):
     def test_translation_py2py3_suse(self):
         self.assertEqual(pymod2pkg.module2package('nova', 'suse',
                          py_vers=['py', 'py2', 'py3']),
-                         ['openstack-nova', '', ''])
+                         ['openstack-nova', 'openstack-nova',
+                          'openstack-nova'])
         self.assertEqual(pymod2pkg.module2package('aodhclient',
                          'suse', py_vers=['py2', 'py3']),
                          ['python2-aodhclient', 'python3-aodhclient'])
@@ -149,7 +150,8 @@ class Pymod2PkgTests(unittest.TestCase):
                          ['python2-neutronclient', 'python3-neutronclient'])
         self.assertEqual(pymod2pkg.module2package('Tempest', 'suse',
                          py_vers=['py', 'py2', 'py3']),
-                         ['openstack-tempest', '', ''])
+                         ['openstack-tempest', 'openstack-tempest',
+                          'openstack-tempest'])
         self.assertEqual(pymod2pkg.module2package('devel', 'suse',
                          py_vers=['py2', 'py3']),
                          ['python-devel', 'python3-devel'])
@@ -179,7 +181,8 @@ class Pymod2PkgTests(unittest.TestCase):
                          ['python-babel', 'python3-babel'])
         self.assertEqual(pymod2pkg.module2package('nova', 'fedora',
                          py_vers=['py', 'py2', 'py3']),
-                         ['openstack-nova', '', ''])
+                         ['openstack-nova', 'openstack-nova',
+                          'openstack-nova'])
 
 
 class RegexRuleTests(unittest.TestCase):