Merge lp:~freyes/charm-helpers/lp1660630 into lp:charm-helpers

[Felipe Reyes]

Verify python version to decide which package to install

Check using six.PY2 to decide if python-foo or python3-foo package should be installed after an ImportError exception.

[Stuart Bishop (stub)]

Thanks for this.

I think this is changing quite a lot of untested codepaths, but that is the way of contrib.

Lint free and tests all pass.

review: Approve

=== modified file 'charmhelpers/contrib/database/mysql.py'
--- charmhelpers/contrib/database/mysql.py	2016-07-06 14:41:05 +0000
+++ charmhelpers/contrib/database/mysql.py	2017-02-16 03:08:57 +0000
@@ -17,6 +17,7 @@
 import platform
 import os
 import glob
+import six
 
 # from string import upper
 
@@ -50,7 +51,10 @@
     import MySQLdb
 except ImportError:
     apt_update(fatal=True)
-    apt_install(filter_installed_packages(['python-mysqldb']), fatal=True)
+    if six.PY2:
+        apt_install(filter_installed_packages(['python-mysqldb']), fatal=True)
+    else:
+        apt_install(filter_installed_packages(['python3-mysqldb']), fatal=True)
     import MySQLdb
 
 

=== modified file 'charmhelpers/contrib/hardening/templating.py'
--- charmhelpers/contrib/hardening/templating.py	2016-07-06 14:41:05 +0000
+++ charmhelpers/contrib/hardening/templating.py	2017-02-16 03:08:57 +0000
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import os
+import six
 
 from charmhelpers.core.hookenv import (
     log,
@@ -26,7 +27,10 @@
     from charmhelpers.fetch import apt_install
     from charmhelpers.fetch import apt_update
     apt_update(fatal=True)
-    apt_install('python-jinja2', fatal=True)
+    if six.PY2:
+        apt_install('python-jinja2', fatal=True)
+    else:
+        apt_install('python3-jinja2', fatal=True)
     from jinja2 import FileSystemLoader, Environment
 
 

=== modified file 'charmhelpers/contrib/mellanox/infiniband.py'
--- charmhelpers/contrib/mellanox/infiniband.py	2016-07-06 14:41:05 +0000
+++ charmhelpers/contrib/mellanox/infiniband.py	2017-02-16 03:08:57 +0000
@@ -17,6 +17,8 @@
 
 __author__ = "Jorge Niedbalski <[e-mail]>"
 
+import six
+
 from charmhelpers.fetch import (
     apt_install,
     apt_update,
@@ -30,7 +32,10 @@
 try:
     from netifaces import interfaces as network_interfaces
 except ImportError:
-    apt_install('python-netifaces')
+    if six.PY2:
+        apt_install('python-netifaces')
+    else:
+        apt_install('python3-netifaces')
     from netifaces import interfaces as network_interfaces
 
 import os

=== modified file 'charmhelpers/contrib/network/ip.py'
--- charmhelpers/contrib/network/ip.py	2017-01-25 17:13:37 +0000
+++ charmhelpers/contrib/network/ip.py	2017-02-16 03:08:57 +0000
@@ -31,14 +31,20 @@
     import netifaces
 except ImportError:
     apt_update(fatal=True)
-    apt_install('python-netifaces', fatal=True)
+    if six.PY2:
+        apt_install('python-netifaces', fatal=True)
+    else:
+        apt_install('python3-netifaces', fatal=True)
     import netifaces
 
 try:
     import netaddr
 except ImportError:
     apt_update(fatal=True)
-    apt_install('python-netaddr', fatal=True)
+    if six.PY2:
+        apt_install('python-netaddr', fatal=True)
+    else:
+        apt_install('python3-netaddr', fatal=True)
     import netaddr
 
 
@@ -414,7 +420,10 @@
     try:
         import dns.resolver
     except ImportError:
-        apt_install('python-dnspython', fatal=True)
+        if six.PY2:
+            apt_install('python-dnspython', fatal=True)
+        else:
+            apt_install('python3-dnspython', fatal=True)
         import dns.resolver
 
     if isinstance(address, dns.name.Name):
@@ -462,7 +471,10 @@
         try:
             import dns.reversename
         except ImportError:
-            apt_install("python-dnspython", fatal=True)
+            if six.PY2:
+                apt_install("python-dnspython", fatal=True)
+            else:
+                apt_install("python3-dnspython", fatal=True)
             import dns.reversename
 
         rev = dns.reversename.from_address(address)

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2016-12-14 17:48:32 +0000
+++ charmhelpers/contrib/openstack/context.py	2017-02-16 03:08:57 +0000
@@ -100,7 +100,10 @@
 try:
     import psutil
 except ImportError:
-    apt_install('python-psutil', fatal=True)
+    if six.PY2:
+        apt_install('python-psutil', fatal=True)
+    else:
+        apt_install('python3-psutil', fatal=True)
     import psutil
 
 CA_CERT_PATH = '/usr/local/share/ca-certificates/keystone_juju_ca_cert.crt'

=== modified file 'charmhelpers/contrib/openstack/templating.py'
--- charmhelpers/contrib/openstack/templating.py	2016-07-06 14:41:05 +0000
+++ charmhelpers/contrib/openstack/templating.py	2017-02-16 03:08:57 +0000
@@ -28,7 +28,10 @@
     from jinja2 import FileSystemLoader, ChoiceLoader, Environment, exceptions
 except ImportError:
     apt_update(fatal=True)
-    apt_install('python-jinja2', fatal=True)
+    if six.PY2:
+        apt_install('python-jinja2', fatal=True)
+    else:
+        apt_install('python3-jinja2', fatal=True)
     from jinja2 import FileSystemLoader, ChoiceLoader, Environment, exceptions
 
 
@@ -207,7 +210,10 @@
             # if this code is running, the object is created pre-install hook.
             # jinja2 shouldn't get touched until the module is reloaded on next
             # hook execution, with proper jinja2 bits successfully imported.
-            apt_install('python-jinja2')
+            if six.PY2:
+                apt_install('python-jinja2')
+            else:
+                apt_install('python3-jinja2')
 
     def register(self, config_file, contexts):
         """

=== modified file 'charmhelpers/contrib/python/packages.py'
--- charmhelpers/contrib/python/packages.py	2016-07-06 14:41:05 +0000
+++ charmhelpers/contrib/python/packages.py	2017-02-16 03:08:57 +0000
@@ -16,6 +16,7 @@
 # limitations under the License.
 
 import os
+import six
 import subprocess
 import sys
 
@@ -39,7 +40,10 @@
             from pip import main as _pip_execute
         except ImportError:
             apt_update()
-            apt_install('python-pip')
+            if six.PY2:
+                apt_install('python-pip')
+            else:
+                apt_install('python3-pip')
             from pip import main as _pip_execute
         _pip_execute(*args, **kwargs)
     finally:
@@ -136,7 +140,10 @@
 
 def pip_create_virtualenv(path=None):
     """Create an isolated Python environment."""
-    apt_install('python-virtualenv')
+    if six.PY2:
+        apt_install('python-virtualenv')
+    else:
+        apt_install('python3-virtualenv')
 
     if path:
         venv_path = path

=== modified file 'tests/contrib/network/test_ip.py'
--- tests/contrib/network/test_ip.py	2016-07-18 15:59:52 +0000
+++ tests/contrib/network/test_ip.py	2017-02-16 03:08:57 +0000
@@ -641,7 +641,10 @@
         fake_dns = FakeDNS('5.5.5.5')
         with patch(builtin_import, side_effect=[ImportError, fake_dns]):
             nsq = net_ip.ns_query('5.5.5.5')
-            apt_install.assert_called_with('python-dnspython', fatal=True)
+            if six.PY2:
+                apt_install.assert_called_with('python-dnspython', fatal=True)
+            else:
+                apt_install.assert_called_with('python3-dnspython', fatal=True)
         self.assertEquals(nsq, '5.5.5.5')
 
     @patch('charmhelpers.contrib.network.ip.apt_install')
@@ -708,7 +711,11 @@
         with patch(builtin_import, side_effect=[ImportError, fake_dns,
                                                 fake_dns]):
             hn = net_ip.get_hostname('4.2.2.1')
-            apt_install.assert_called_with('python-dnspython', fatal=True)
+            if six.PY2:
+                apt_install.assert_called_with('python-dnspython', fatal=True)
+            else:
+                apt_install.assert_called_with('python3-dnspython', fatal=True)
+
         self.assertEquals(hn, 'www.ubuntu.com')
 
     @patch('charmhelpers.contrib.network.ip.socket.gethostbyaddr')

=== modified file 'tests/contrib/openstack/test_os_templating.py'
--- tests/contrib/openstack/test_os_templating.py	2015-02-11 21:41:57 +0000
+++ tests/contrib/openstack/test_os_templating.py	2017-02-16 03:08:57 +0000
@@ -78,7 +78,10 @@
         templating.FileSystemLoader = MockFSLoader
         templating.ChoiceLoader = MockChoiceLoader
         templating.Environment = MagicMock
-        apt.assert_called_with('python-jinja2')
+        if six.PY2:
+            apt.assert_called_with('python-jinja2')
+        else:
+            apt.assert_called_with('python3-jinja2')
 
     def test_create_renderer_invalid_templates_dir(self):
         '''Ensure OSConfigRenderer checks templates_dir'''

=== modified file 'tests/contrib/python/test_packages.py'
--- tests/contrib/python/test_packages.py	2015-10-28 21:59:47 +0000
+++ tests/contrib/python/test_packages.py	2017-02-16 03:08:57 +0000
@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 # coding: utf-8
 
+import mock
+import six
+
 from unittest import TestCase
 from charmhelpers.contrib.python import packages
 
-import mock
-
 __author__ = "Jorge Niedbalski <[e-mail]>"
 
 TO_PATCH = [
@@ -169,5 +170,8 @@
         """
         join.return_value = 'joined-path'
         packages.pip_create_virtualenv()
-        self.apt_install.assert_called_with('python-virtualenv')
+        if six.PY2:
+            self.apt_install.assert_called_with('python-virtualenv')
+        else:
+            self.apt_install.assert_called_with('python3-virtualenv')
         check_call.assert_called_with(['virtualenv', 'joined-path'])