Simplify rho.translation module

Instead of rho.translation exporting a function which then returns the
gettext lookup function, just have the module export the right
function.

Also do some minor cleanups in scancommand.py to fix lint errors.

rho/authaddcommand.py

@@ -23,9 +23,7 @@
 from rho import utilities
 from rho.clicommand import CliCommand
 from rho.vault import get_vault
-from rho.translation import get_translation
-
-_ = get_translation()
+from rho.translation import _
 
 
 def auth_exists(cred_list, auth_name):

rho/authclearcommand.py

@@ -20,9 +20,7 @@
 from rho import utilities
 from rho.clicommand import CliCommand
 from rho.vault import get_vault
-from rho.translation import get_translation
-
-_ = get_translation()
+from rho.translation import _
 
 
 class AuthClearCommand(CliCommand):

rho/autheditcommand.py

@@ -21,9 +21,7 @@
 from rho import utilities
 from rho.clicommand import CliCommand
 from rho.vault import get_vault
-from rho.translation import get_translation
-
-_ = get_translation()
+from rho.translation import _
 
 
 def optional_arg(arg_default):

rho/authlistcommand.py

@@ -21,9 +21,7 @@
 from rho import utilities
 from rho.clicommand import CliCommand
 from rho.vault import get_vault
-from rho.translation import get_translation
-
-_ = get_translation()
+from rho.translation import _
 
 
 class AuthListCommand(CliCommand):

rho/authshowcommand.py

@@ -20,9 +20,7 @@
 from rho import utilities
 from rho.clicommand import CliCommand
 from rho.vault import get_vault
-from rho.translation import get_translation
-
-_ = get_translation()
+from rho.translation import _
 
 
 class AuthShowCommand(CliCommand):

rho/cli.py

@@ -31,9 +31,6 @@
 from rho.profilelistcommand import ProfileListCommand  # noqa
 from rho.profileshowcommand import ProfileShowCommand  # noqa
 from rho.scancommand import ScanCommand  # noqa
-from rho.translation import get_translation
-
-_ = get_translation()
 
 
 class CLI(object):

rho/clicommand.py

@@ -15,9 +15,7 @@
 from __future__ import print_function
 import sys
 from optparse import OptionParser  # pylint: disable=deprecated-module
-from rho.translation import get_translation
-
-_ = get_translation()
+from rho.translation import _
 
 
 class CliCommand(object):

rho/profileaddcommand.py

@@ -22,9 +22,7 @@
 from rho.clicommand import CliCommand
 from rho.vault import get_vault
 from rho.utilities import multi_arg, _check_range_validity, _read_in_file
-from rho.translation import get_translation
-
-_ = get_translation()
+from rho.translation import _
 
 
 def profile_exists(profile_list, profile_name):

rho/profileclearcommand.py

@@ -21,9 +21,7 @@
 from rho import utilities
 from rho.clicommand import CliCommand
 from rho.vault import get_vault
-from rho.translation import get_translation
-
-_ = get_translation()
+from rho.translation import _
 
 
 class ProfileClearCommand(CliCommand):

rho/profileeditcommand.py

@@ -21,9 +21,7 @@
 from rho.clicommand import CliCommand
 from rho.vault import get_vault
 from rho.utilities import multi_arg, _check_range_validity, _read_in_file
-from rho.translation import get_translation
-
-_ = get_translation()
+from rho.translation import _
 
 
 class ProfileEditCommand(CliCommand):

rho/profilelistcommand.py

@@ -21,9 +21,7 @@
 from rho import utilities
 from rho.clicommand import CliCommand
 from rho.vault import get_vault
-from rho.translation import get_translation
-
-_ = get_translation()
+from rho.translation import _
 
 
 class ProfileListCommand(CliCommand):

rho/profileshowcommand.py

@@ -21,9 +21,7 @@
 from rho import utilities
 from rho.clicommand import CliCommand
 from rho.vault import get_vault
-from rho.translation import get_translation
-
-_ = get_translation()
+from rho.translation import _
 
 
 class ProfileShowCommand(CliCommand):

rho/scancommand.py

@@ -24,9 +24,7 @@
 from rho.clicommand import CliCommand
 from rho.vault import get_vault_and_password
 from rho.utilities import multi_arg, _read_in_file, str_to_ascii
-from rho.translation import get_translation
-
-_ = get_translation()
+from rho.translation import _
 
 
 # Read ssh key from file
@@ -101,11 +99,12 @@ def _create_ping_inventory(vault, vault_pass, profile_ranges, profile_port,
         with open('data/ping_log', 'r') as ping_log:
             out = ping_log.readlines()
 
-        for line, _ in enumerate(out):
-            if 'pong' in out[line]:
+        # pylint: disable=unused-variable
+        for linenum, line in enumerate(out):
+            if 'pong' in out[linenum]:
                 tup_auth_item = tuple(auth_item)
                 success_auths.add(tup_auth_item)
-                host_line = out[line - 2].replace('\x1b[0;32m', '')
+                host_line = out[linenum - 2].replace('\x1b[0;32m', '')
                 host_ip = host_line.split('|')[0].strip()
                 success_hosts.add(host_ip)
                 if host_ip not in mapped_hosts:

rho/translation.py

@@ -15,12 +15,8 @@
 
 T = gettext.translation('rho', 'locale', fallback=True)
 
-
-def get_translation():
-    """Obtains the locale based translation setup for rho"""
-    if hasattr(T, 'ugettext'):
-        # pylint: disable=no-member
-        _ = T.ugettext
-    else:
-        _ = T.gettext
-    return _
+if hasattr(T, 'ugettext'):
+    # pylint: disable=no-member
+    _ = T.ugettext
+else:
+    _ = T.gettext

rho/utilities.py

@@ -14,7 +14,7 @@
 import os
 import sys
 import re
-from rho.translation import get_translation
+from rho.translation import _
 
 CREDENTIALS_PATH = 'data/credentials'
 PROFILES_PATH = 'data/profiles'
@@ -112,9 +112,6 @@ def ensure_config_dir_exists():
         os.makedirs('data')
 
 
-_ = get_translation()
-
-
 # pylint: disable=unused-argument
 def multi_arg(option, opt_str, value, parser):
     """Call back function for arg-parse