ESC: post giant merge comment and future cleanup

Author: jettero

contrib/disk-queue-info.py

@@ -1,7 +1,5 @@
 #!/usr/bin/env python
 
-from __future__ import print_function
-
 import os
 import argparse
 import json

hubblestack/fileserver/azurefs.py

@@ -46,8 +46,6 @@
     Do not include the leading ? for sas_token if generated from the web
 """
 
-# Import python libs
-
 import base64
 import json
 import logging

hubblestack/fileserver/gitfs.py

@@ -48,7 +48,6 @@
 .. _GitPython: https://github.com/gitpython-developers/GitPython
 """
 
-# Import python libs
 import logging
 
 PER_REMOTE_OVERRIDES = (

hubblestack/fileserver/roots.py

@@ -16,7 +16,6 @@
 configuration option.
 """
 
-# Import python libs
 import os
 import errno
 import logging

hubblestack/fileserver/s3fs.py

@@ -78,21 +78,17 @@
     https://docs.aws.amazon.com/AmazonS3/latest/API/RESTCommonResponseHeaders.html
 """
 
-# Import python libs
-
 import datetime
 import os
 import time
 import pickle
 import logging
 
-# Import salt libs
 import hubblestack.fileserver as fs
 import hubblestack.utils.files
 import hubblestack.utils.gzip_util
 import hubblestack.utils.hashutils
 
-# Import 3rd-party libs
 # pylint: disable=import-error,no-name-in-module,redefined-builtin
 from urllib.parse import quote as _quote
 # pylint: enable=import-error,no-name-in-module,redefined-builtin

hubblestack/utils/atomicfile.py

@@ -4,7 +4,6 @@
 atomic way
 '''
 
-# Import python libs
 import os
 import tempfile
 import sys

hubblestack/utils/gzip_util.py

@@ -5,8 +5,6 @@
     Helper module for handling gzip consistently between 2.7+ and 2.6-
 """
 
-
-# Import python libs
 import gzip
 import io
 

hubblestack/utils/hashutils.py

@@ -2,7 +2,7 @@
 """
 A collection of hashing and encoding utils.
 """
-# Import python libs
+
 import hashlib
 
 import hubblestack.utils.files

hubblestack/utils/itertools.py

@@ -3,7 +3,6 @@
 Helpful generators and other tools
 '''
 
-# Import python libs
 import fnmatch
 import re
 
@@ -82,4 +81,4 @@ def fnmatch_multiple(candidates, pattern):
                 return candidate
         except TypeError:
             pass
-    return None
+    return None

hubblestack/utils/path.py

@@ -4,7 +4,6 @@
 lack of support for reading NTFS links.
 '''
 
-# Import python libs
 import logging
 import collections
 import os

hubblestack/utils/process.py

@@ -3,7 +3,6 @@
 Functions for daemonizing and otherwise modifying running processes
 '''
 
-# Import python libs
 import os
 import time
 import signal
@@ -62,4 +61,4 @@ def os_is_running(pid):
             os.kill(pid, 0)  # SIG 0 is the "are you alive?" signal
             return True
         except OSError:
-            return False
+            return False

hubblestack/utils/s3.py

@@ -6,10 +6,8 @@
 """
 
 
-# Import Python libs
 import logging
 
-# Import 3rd-party libs
 try:
     import requests
     HAS_REQUESTS = True  # pylint: disable=W0612

hubblestack/utils/url.py

@@ -3,10 +3,8 @@
 URL utils
 '''
 
-# Import python libs
 import re
 
-# Import salt libs
 from urllib.parse import urlparse, urlunparse  # pylint: disable=import-error,no-name-in-module
 import hubblestack.utils.path
 import hubblestack.utils.platform
@@ -122,4 +120,4 @@ def strip_proto(url):
     Return a copy of the string with the protocol designation stripped, if one
     was present.
     '''
-    return re.sub('^[^:/]+://', '', url)
+    return re.sub('^[^:/]+://', '', url)

hubblestack/utils/user.py

@@ -4,7 +4,6 @@
 belongs.
 """
 
-# Import Python libs
 import getpass
 import logging
 import os

hubblestack/utils/validate/net.py

@@ -3,11 +3,9 @@
 Various network validation utilities
 '''
 
-# Import Python libs
 import re
 import socket
 
-# Import Salt libs
 import hubblestack.utils.platform
 
 if hubblestack.utils.platform.is_windows():

hubblestack/utils/validate/path.py

@@ -9,10 +9,8 @@
     Several path related validators
 '''
 
-# Import python libs
 import os
 
-
 def is_writeable(path, check_parent=False):
     '''
     Check if a given path is writeable by the current user.

hubblestack/utils/validate/user.py

@@ -3,7 +3,6 @@
 Various user validation utilities
 '''
 
-# Import python libs
 import re
 import logging
 

hubblestack/utils/win_functions.py

@@ -5,7 +5,6 @@
 """
 import re
 
-# Import 3rd Party Libs
 try:
     import psutil
     import pywintypes

hubblestack/utils/win_osinfo.py

@@ -4,7 +4,6 @@
 '''
 # http://stackoverflow.com/questions/32300004/python-ctypes-getting-0-with-getversionex-function
 
-# Import Third Party Libs
 import ctypes
 HAS_WIN32 = True
 try:

hubblestack/utils/win_reg.py

@@ -117,7 +117,6 @@ def __init__(self):
             'REG_OPTION_NON_VOLATILE': 0,
             'REG_OPTION_VOLATILE':     1
         }
-        # Return Unicode due to from __future__ import unicode_literals
         self.vtype_reverse = {
             win32con.REG_BINARY:    'REG_BINARY',
             win32con.REG_DWORD:     'REG_DWORD',

tests/support/helpers.py

@@ -11,8 +11,6 @@
 '''
 # pylint: disable=repr-flag-used-in-string,wrong-import-order
 
-# Import Python libs
-from __future__ import absolute_import, print_function, unicode_literals
 import base64
 import errno
 import functools

tests/support/mixins.py

@@ -10,8 +10,6 @@
 '''
 # pylint: disable=repr-flag-used-in-string
 
-# Import python libs
-from __future__ import absolute_import, print_function
 import os
 import sys
 import time

tests/support/mock.py

@@ -14,7 +14,6 @@
 '''
 # pylint: disable=unused-import,function-redefined,blacklisted-module,blacklisted-external-module
 
-from __future__ import absolute_import
 import collections
 import copy
 import errno

tests/support/paths.py

@@ -11,8 +11,6 @@
     Tests related paths
 '''
 
-# Import python libs
-from __future__ import absolute_import
 import os
 import re
 import sys

tests/support/runtests.py

@@ -46,8 +46,6 @@
     .. _`nose`: https://nose.readthedocs.org
     '''
 
-# Import Python modules
-from __future__ import absolute_import, print_function
 import os
 import shutil
 import logging

tests/support/unit.py

@@ -21,8 +21,6 @@
 '''
 # pylint: disable=unused-import,blacklisted-module,deprecated-method
 
-# Import python libs
-from __future__ import absolute_import, print_function, unicode_literals
 import os
 import sys
 import logging

tests/unittests/grains/test_core.py

@@ -3,8 +3,6 @@
     :codeauthor: Erik Johnson <[email protected]>
 '''
 
-# Import Python libs
-from __future__ import absolute_import, print_function, unicode_literals
 import logging
 import os
 import socket

tests/unittests/grains/test_disks.py

@@ -2,8 +2,7 @@
 '''
     :codeauthor: :email:`Shane Lee <[email protected]>`
 '''
-# Import Python libs
-from __future__ import absolute_import, print_function, unicode_literals
+
 import textwrap
 
 from tests.support.mixins import LoaderModuleMockMixin

tests/unittests/modules/test_aptpkg.py

@@ -6,8 +6,6 @@
     versionadded:: 2017.7.0
 '''
 
-# Import Python Libs
-from __future__ import absolute_import, print_function, unicode_literals
 import copy
 import textwrap
 

tests/unittests/modules/test_cmdmod.py

@@ -3,21 +3,17 @@
     :codeauthor: Nicole Thomas <[email protected]>
 '''
 
-# Import python libs
-from __future__ import absolute_import, print_function, unicode_literals
 import os
 import sys
 import tempfile
 import builtins
 
-# Import Salt Libs
 import hubblestack.utils.files
 import hubblestack.utils.platform
 import hubblestack.modules.cmdmod as cmdmod
 from hubblestack.exceptions import CommandExecutionError
 from hubblestack.log import LOG_LEVELS
 
-# Import Salt Testing Libs
 from tests.support.mixins import LoaderModuleMockMixin
 from tests.support.unit import TestCase, skipIf
 from tests.support.paths import FILES

tests/unittests/modules/test_debian_service.py

@@ -2,10 +2,7 @@
 '''
     :codeauthor: Rupesh Tare <[email protected]>
 '''
-# Import Python libs
-from __future__ import absolute_import, print_function, unicode_literals
 
-# Import Salt Testing Libs
 from tests.support.mixins import LoaderModuleMockMixin
 from tests.support.unit import TestCase, skipIf
 from tests.support.mock import (
@@ -15,7 +12,6 @@
     NO_MOCK_REASON
 )
 
-# Import Salt Libs
 import hubblestack.modules.debian_service as debian_service
 
 
@@ -77,4 +73,4 @@ def test_enabled(self):
         '''
         mock = MagicMock(return_value=['A'])
         with patch.object(debian_service, 'get_enabled', mock):
-            self.assertFalse(debian_service.enabled('name'))
+            self.assertFalse(debian_service.enabled('name'))

tests/unittests/modules/test_gentoo_service.py

@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
 
-# Import Python libs
-from __future__ import absolute_import, print_function, unicode_literals
-
-# Import Salt Testing Libs
 from tests.support.mixins import LoaderModuleMockMixin
 from tests.support.unit import TestCase, skipIf
 from tests.support.mock import (
@@ -14,7 +10,6 @@
     call
 )
 
-# Import Salt Libs
 import hubblestack.modules.gentoo_service as gentoo_service
 
 

tests/unittests/modules/test_linux_sysctl.py

@@ -3,15 +3,10 @@
     :codeauthor: jmoney <[email protected]>
 """
 
-# Import Python libs
-from __future__ import absolute_import, print_function, unicode_literals
-
-# Import Salt Libs
 import hubblestack.modules.linux_sysctl as linux_sysctl
 import hubblestack.modules.systemd_service as systemd
 from hubblestack.exceptions import CommandExecutionError
 
-# Import Salt Testing Libs
 from tests.support.mixins import LoaderModuleMockMixin
 from tests.support.mock import MagicMock, mock_open, patch
 from tests.support.unit import TestCase

tests/unittests/modules/test_mac_sysctl.py

@@ -3,14 +3,9 @@
     :codeauthor: Nicole Thomas <[email protected]>
 """
 
-# Import Python libs
-from __future__ import absolute_import, print_function, unicode_literals
-
-# Import Salt Libs
 import hubblestack.modules.mac_sysctl as mac_sysctl
 from hubblestack.exceptions import CommandExecutionError
 
-# Import Salt Testing Libs
 from tests.support.mixins import LoaderModuleMockMixin
 from tests.support.mock import DEFAULT, MagicMock, mock_open, patch
 from tests.support.unit import TestCase