localise the raw_input workaround to useradm

Author: albu-diku

mig/shared/compat.py

@@ -46,10 +46,6 @@
 _TYPE_UNICODE = type(u"")
 
 
-if not PY2:
-    raw_input = input
-
-
 def _is_unicode(val):
     """Return boolean indicating if the value is a unicode string.
 

mig/shared/useradm.py

@@ -47,7 +47,7 @@
 from mig.shared.base import client_id_dir, client_dir_id, client_alias, \
     get_client_id, extract_field, fill_user, fill_distinguished_name, \
     is_gdp_user, mask_creds, sandbox_resource
-from mig.shared.compat import raw_input, _unicode_string_to_escaped_unicode
+from mig.shared.compat import PY2, _unicode_string_to_escaped_unicode
 from mig.shared.conf import get_configuration_object
 from mig.shared.configuration import Configuration
 from mig.shared.defaults import user_db_filename, keyword_auto, ssh_conf_dir, \
@@ -86,6 +86,9 @@
     force_update_user_map, force_update_resource_map, force_update_vgrid_map, \
     VGRIDS, OWNERS, MEMBERS
 
+if not PY2:
+    raw_input = input
+
 ssh_authkeys = os.path.join(ssh_conf_dir, authkeys_filename)
 ssh_authpasswords = os.path.join(ssh_conf_dir, authpasswords_filename)
 ssh_authdigests = os.path.join(ssh_conf_dir, authdigests_filename)