Convert "Can be removed" lines into TODO lines

salt/cli/batch.py

@@ -11,7 +11,7 @@ import copy
 from datetime import datetime, timedelta
 
 # Import salt libs
-import salt.utils  # Can be removed once print_cli is moved
+import salt.utils  # TODO: Remove this once print_cli is moved
 import salt.client
 import salt.output
 import salt.exceptions

salt/cli/caller.py

@@ -20,7 +20,7 @@ import salt.minion
 import salt.output
 import salt.payload
 import salt.transport
-import salt.utils  # Can be removed once print_cli, activate_profile, and output_profile are moved
+import salt.utils  # TODO: Remove this once print_cli, activate_profile, and output_profile are moved
 import salt.utils.args
 import salt.utils.files
 import salt.utils.jid

salt/cli/run.py

@@ -2,7 +2,7 @@
 from __future__ import print_function
 from __future__ import absolute_import
 
-import salt.utils  # Can be removed once activate_profile and output_profile are moved
+import salt.utils  # TODO: Remove this once activate_profile and output_profile are moved
 import salt.utils.parsers
 from salt.utils.verify import check_user, verify_log
 from salt.exceptions import SaltClientError

salt/cli/salt.py

@@ -7,7 +7,7 @@ sys.modules['pkg_resources'] = None
 import os
 
 # Import Salt libs
-import salt.utils  # Can be removed once print_cli is moved
+import salt.utils  # TODO: Remove this once print_cli is moved
 import salt.utils.parsers
 from salt.utils.args import yamlify_arg
 from salt.utils.verify import verify_log

salt/client/mixins.py

@@ -16,7 +16,7 @@ import copy as pycopy
 # Import Salt libs
 import salt.exceptions
 import salt.minion
-import salt.utils  # Can be removed once format_call is moved
+import salt.utils  # TODO: Remove this once format_call is moved
 import salt.utils.args
 import salt.utils.doc
 import salt.utils.error

salt/cloud/clouds/openstack.py

@@ -185,7 +185,7 @@ except Exception:
 from salt.cloud.libcloudfuncs import *   # pylint: disable=W0614,W0401
 
 # Import salt libs
-import salt.utils  # Can be removed once namespaced_function has been moved
+import salt.utils  # TODO: Remove this once namespaced_function has been moved
 import salt.utils.cloud
 import salt.utils.files
 import salt.utils.pycrypto

salt/daemons/masterapi.py

@@ -15,7 +15,7 @@ import stat
 
 # Import salt libs
 import salt.crypt
-import salt.utils  # Can be removed once check_whitelist_blacklist, expr_match, get_values_of_matching_keys are moved
+import salt.utils  # TODO: Remove this once check_whitelist_blacklist, expr_match, get_values_of_matching_keys are moved
 import salt.cache
 import salt.client
 import salt.payload

salt/key.py

@@ -22,7 +22,7 @@ import salt.crypt
 import salt.daemons.masterapi
 import salt.exceptions
 import salt.minion
-import salt.utils  # Can be removed once get_master_key is moved
+import salt.utils  # TODO: Remove this once get_master_key is moved
 import salt.utils.args
 import salt.utils.crypt
 import salt.utils.data

salt/master.py

@@ -47,7 +47,7 @@ import tornado.gen  # pylint: disable=F0401
 
 # Import salt libs
 import salt.crypt
-import salt.utils  # Can be removed once get_values_of_matching_keys is moved
+import salt.utils  # TODO: Remove this once get_values_of_matching_keys is moved
 import salt.client
 import salt.payload
 import salt.pillar

salt/modules/aptpkg.py

@@ -38,7 +38,7 @@ from salt.ext.six.moves.urllib.request import Request as _Request, urlopen as _u
 import salt.config
 import salt.syspaths
 from salt.modules.cmdmod import _parse_env
-import salt.utils  # Can be removed when alias_function is moved
+import salt.utils  # TODO: Remove this when alias_function is moved
 import salt.utils.args
 import salt.utils.data
 import salt.utils.files

salt/modules/ebuild.py

@@ -21,7 +21,7 @@ import logging
 import re
 
 # Import salt libs
-import salt.utils  # Can be removed once alias_function is moved
+import salt.utils  # TODO: Remove this once alias_function is moved
 import salt.utils.args
 import salt.utils.data
 import salt.utils.path

salt/modules/freebsdpkg.py

@@ -80,7 +80,7 @@ import logging
 import re
 
 # Import salt libs
-import salt.utils  # Can be removed when alias_function is moved
+import salt.utils  # TODO: Remove this when alias_function is moved
 import salt.utils.data
 import salt.utils.pkg
 from salt.exceptions import CommandExecutionError, MinionError

salt/modules/mac_brew.py

@@ -17,7 +17,7 @@ import json
 import logging
 
 # Import salt libs
-import salt.utils  # Can be removed when alias_function is moved
+import salt.utils  # TODO: Remove this when alias_function is moved
 import salt.utils.data
 import salt.utils.path
 import salt.utils.pkg

salt/modules/mac_ports.py

@@ -37,7 +37,7 @@ import logging
 import re
 
 # Import salt libs
-import salt.utils  # Can be removed when alias_function is removed
+import salt.utils  # TODO: Remove this when alias_function is removed
 import salt.utils.data
 import salt.utils.path
 import salt.utils.pkg

salt/modules/network.py

@@ -13,7 +13,7 @@ import os
 import socket
 
 # Import salt libs
-import salt.utils  # Can be removed when alias_function mac_str_to_bytes are moved
+import salt.utils  # TODO: Remove this when alias_function mac_str_to_bytes are moved
 import salt.utils.decorators.path
 import salt.utils.files
 import salt.utils.network

salt/modules/pacman.py

@@ -18,7 +18,7 @@ import logging
 import os.path
 
 # Import salt libs
-import salt.utils  # Can be removed once alias_function, fnmatch_multiple are moved
+import salt.utils  # TODO: Remove this once alias_function, fnmatch_multiple are moved
 import salt.utils.args
 import salt.utils.data
 import salt.utils.pkg

salt/modules/pillar.py

@@ -17,7 +17,7 @@ from salt.ext import six
 
 # Import salt libs
 import salt.pillar
-import salt.utils  # Can be removed once alias_function is moved
+import salt.utils  # TODO: Remove this once alias_function is moved
 import salt.utils.crypt
 import salt.utils.data
 import salt.utils.dictupdate

salt/modules/pkgin.py

@@ -17,7 +17,7 @@ import os
 import re
 
 # Import salt libs
-import salt.utils  # Can be removed when alias_function is moved
+import salt.utils  # TODO: Remove this when alias_function is moved
 import salt.utils.data
 import salt.utils.path
 import salt.utils.pkg

salt/modules/pkgng.py

@@ -44,7 +44,7 @@ import logging
 import os
 
 # Import salt libs
-import salt.utils  # Can be removed once alias_function is moved
+import salt.utils  # TODO: Remove this once alias_function is moved
 import salt.utils.data
 import salt.utils.files
 import salt.utils.itertools

salt/modules/pkgutil.py

@@ -14,7 +14,7 @@ from __future__ import absolute_import
 import copy
 
 # Import salt libs
-import salt.utils  # Can be removed once alias_function is moved
+import salt.utils  # TODO: Remove this once alias_function is moved
 import salt.utils.data
 import salt.utils.pkg
 import salt.utils.versions

salt/modules/rpmbuild.py

@@ -24,7 +24,7 @@ import functools
 
 # Import salt libs
 from salt.exceptions import SaltInvocationError
-import salt.utils  # Can be removed when chugid_and_umask is moved
+import salt.utils  # TODO: Remove this when chugid_and_umask is moved
 import salt.utils.files
 import salt.utils.path
 import salt.utils.vt

salt/modules/saltutil.py

@@ -46,7 +46,7 @@ import salt.payload
 import salt.runner
 import salt.state
 import salt.transport
-import salt.utils  # Can be removed once alias_function is moved
+import salt.utils  # TODO: Remove this once alias_function is moved
 import salt.utils.args
 import salt.utils.event
 import salt.utils.extmods

salt/modules/solarisips.py

@@ -43,7 +43,7 @@ import logging
 
 
 # Import salt libs
-import salt.utils  # Can be removed once alias_function is moved
+import salt.utils  # TODO: Remove this once alias_function is moved
 import salt.utils.data
 import salt.utils.path
 import salt.utils.pkg

salt/modules/solarispkg.py

@@ -16,7 +16,7 @@ import os
 import logging
 
 # Import salt libs
-import salt.utils  # Can be removed once alias_function is moved
+import salt.utils  # TODO: Remove this once alias_function is moved
 import salt.utils.data
 import salt.utils.files
 from salt.exceptions import CommandExecutionError, MinionError

salt/modules/state.py

@@ -28,7 +28,7 @@ import time
 import salt.config
 import salt.payload
 import salt.state
-import salt.utils  # Can be removed once namespaced_function is moved
+import salt.utils  # TODO: Remove this once namespaced_function is moved
 import salt.utils.args
 import salt.utils.data
 import salt.utils.event

salt/modules/yumpkg.py

@@ -41,7 +41,7 @@ from salt.ext.six.moves import configparser
 # pylint: enable=import-error,redefined-builtin
 
 # Import Salt libs
-import salt.utils  # Can be removed once alias_function, fnmatch_multiple are moved
+import salt.utils  # TODO: Remove this once alias_function, fnmatch_multiple are moved
 import salt.utils.args
 import salt.utils.data
 import salt.utils.decorators.path

salt/modules/zypper.py

@@ -32,7 +32,7 @@ from xml.dom import minidom as dom
 from xml.parsers.expat import ExpatError
 
 # Import salt libs
-import salt.utils  # Can be removed once alias_function is moved
+import salt.utils  # TODO: Remove this once alias_function is moved
 import salt.utils.data
 import salt.utils.event
 import salt.utils.files

salt/states/user.py

@@ -29,7 +29,7 @@ import os
 import logging
 
 # Import Salt libs
-import salt.utils  # Can be removed once date_format is moved
+import salt.utils  # TODO: Remove this once date_format is moved
 import salt.utils.platform
 import salt.utils.user
 from salt.utils.locales import sdecode, sdecode_if_string

salt/states/virtualenv_mod.py

@@ -12,7 +12,7 @@ import os
 
 # Import Salt libs
 import salt.version
-import salt.utils  # Can be removed once alias_function is moved
+import salt.utils  # TODO: Remove this once alias_function is moved
 import salt.utils.platform
 import salt.utils.versions
 from salt.exceptions import CommandExecutionError, CommandNotFoundError

salt/utils/files.py

@@ -16,7 +16,7 @@ import time
 import urllib
 
 # Import Salt libs
-import salt.utils  # Can be removed when backup_minion is moved
+import salt.utils  # TODO: Remove this when backup_minion is moved
 import salt.utils.path
 import salt.utils.platform
 import salt.utils.stringutils

salt/utils/gitfs.py

@@ -20,7 +20,7 @@ import time
 from datetime import datetime
 
 # Import salt libs
-import salt.utils  # Can be removed once check_whitelist_blacklist is moved
+import salt.utils  # TODO: Remove this once check_whitelist_blacklist is moved
 import salt.utils.configparser
 import salt.utils.data
 import salt.utils.files

salt/utils/minions.py

@@ -13,7 +13,7 @@ import logging
 
 # Import salt libs
 import salt.payload
-import salt.utils  # Can be removed once expr_match is moved
+import salt.utils  # TODO: Remove this once expr_match is moved
 import salt.utils.data
 import salt.utils.files
 import salt.utils.network

tests/support/mixins.py

@@ -31,7 +31,7 @@ from tests.support.paths import CODE_DIR
 
 # Import salt libs
 import salt.config
-import salt.utils  # Can be removed once namespaced_function is moved
+import salt.utils  # TODO: Remove this once namespaced_function is moved
 import salt.utils.event
 import salt.utils.files
 import salt.utils.path