Remove blocking check. (#140)

* Remove blocking check.

* Pylint fixes.

Author: tjprescott

.pylintrc

@@ -9,11 +9,7 @@
 # R0401 cyclic-import
 # R0205 useless-object-inheritance
 # R1717 consider-using-dict-comprehension
-disable=W0511,C0111,C0103,I0011,R0913,R0903,R0401,R0205,R1717
-
-# note: This is useful but some pylint suppressions only apply to Python 2 or 3
-# and we run pylint on both Python 2 and 3. e.g. You may see some no-member useless-suppression messages.
-enable=useless-suppression
+disable=W0511,C0111,C0103,I0011,R0913,R0903,R0401,R0205,R1717,useless-suppression
 
 [FORMAT]
 max-line-length=120

knack/arguments.py

@@ -59,8 +59,6 @@ def __init__(self, dest=None, argtype=None, **kwargs):
 
         # We'll do an early fault detection to find any instances where we have inconsistent
         # set of parameters for argparse
-        if not self.options_list and 'required' in self.options:  # pylint: disable=access-member-before-definition
-            raise ValueError('You can\'t specify both required and an options_list')
         if not self.options.get('dest', False):
             raise ValueError('Missing dest')
         if not self.options_list:  # pylint: disable=access-member-before-definition

knack/config.py

@@ -62,8 +62,7 @@ def get(self, section, option, fallback=_UNSET):
         except (configparser.NoSectionError, configparser.NoOptionError):
             if fallback is _UNSET:
                 raise
-            else:
-                return fallback
+            return fallback
 
     def getint(self, section, option, fallback=_UNSET):
         return int(self.get(section, option, fallback))

knack/testsdk/base.py

@@ -207,7 +207,7 @@ def __init__(self, cli, command, expect_failure=False):
             logger.error('Command "%s" => %d. (It did not fail as expected) Output: %s', command,
                          self.exit_code, self.output)
             raise AssertionError('The command did not fail as it was expected.')
-        elif not expect_failure and self.exit_code != 0:
+        if not expect_failure and self.exit_code != 0:
             logger.error('Command "%s" => %d. Output: %s', command, self.exit_code, self.output)
             raise AssertionError('The command failed. Exit code: {}'.format(self.exit_code))
 
@@ -255,8 +255,7 @@ def _in_process_execute(self, command):
         except CliExecutionError as ex:
             if ex.exception:
                 raise ex.exception
-            else:
-                raise ex
+            raise ex
         except Exception as ex:  # pylint: disable=broad-except
             self.exit_code = 1
             self.output = out_buffer.getvalue()

knack/testsdk/checkers.py

@@ -21,9 +21,8 @@ def __call__(self, execution_result):
             if actual_result:
                 raise JMESPathCheckAssertionError(self._query, self._expected_result, actual_result,
                                                   execution_result.output)
-            else:
-                raise JMESPathCheckAssertionError(self._query, self._expected_result, 'None',
-                                                  execution_result.output)
+            raise JMESPathCheckAssertionError(self._query, self._expected_result, 'None',
+                                              execution_result.output)
 
 
 class JMESPathCheckExists(object):  # pylint: disable=too-few-public-methods
@@ -54,9 +53,8 @@ def __call__(self, execution_result):
             if actual_result:
                 raise JMESPathCheckAssertionError(self._query, expected_result_format, actual_result,
                                                   execution_result.output)
-            else:
-                raise JMESPathCheckAssertionError(self._query, expected_result_format, 'None',
-                                                  execution_result.output)
+            raise JMESPathCheckAssertionError(self._query, expected_result_format, 'None',
+                                              execution_result.output)
 
 
 class NoneCheck(object):  # pylint: disable=too-few-public-methods

knack/testsdk/recording_processors.py

@@ -49,8 +49,8 @@ def process_response(self, response):
         if length > self._max_response_body * 1024:
             response['body']['string'] = \
                 "!!! The response body has been omitted from the recording because it is larger " \
-                "than {} KB. It will be replaced with blank content of {} bytes while replay. " \
-                "{}{}".format(self._max_response_body, length, self.control_flag, length)
+                "than {max} KB. It will be replaced with blank content of {length} bytes while replay. " \
+                "{flag}{length}".format(max=self._max_response_body, length=length, flag=self.control_flag)
 
         return response
 

knack/util.py

@@ -24,7 +24,7 @@ class CLIError(Exception):
     normal operation of the CLI.
     Typically due to user error and can be resolved by the user.
     """
-    pass
+    pass  # pylint: disable=unnecessary-pass
 
 
 class CtxTypeError(TypeError):

requirements.txt

@@ -3,8 +3,8 @@ colorama==0.3.9
 flake8==3.2.1
 jmespath==0.9.2
 mock==2.0.0
-pylint==1.8.4; python_version <= '2.7'
-pylint==2.1.1; python_version >= '3.5'
+pylint==1.9.4; python_version <= '2.7'
+pylint==2.3.1; python_version >= '3.5'
 pygments==2.2.0
 pyyaml==3.12
 six==1.10.0

setup.py

@@ -9,7 +9,7 @@
 from codecs import open
 from setuptools import setup, find_packages
 
-VERSION = '0.5.2'
+VERSION = '0.5.3'
 
 DEPENDENCIES = [
     'argcomplete',

tests/test_deprecation.py

@@ -14,7 +14,7 @@
 from knack.arguments import ArgumentsContext
 from knack.commands import CLICommand, CLICommandsLoader, CommandGroup
 
-from tests.util import TestCLI
+from tests.util import DummyCLI
 
 
 def example_handler(arg1, arg2=None, arg3=None):
@@ -73,7 +73,7 @@ def load_arguments(self, command):
     type: group
     short-summary: A group.
 """
-        self.cli_ctx = TestCLI(commands_loader_cls=DeprecationTestCommandLoader)
+        self.cli_ctx = DummyCLI(commands_loader_cls=DeprecationTestCommandLoader)
 
     @redirect_io
     def test_deprecate_command_group_help(self):
@@ -186,7 +186,7 @@ def load_arguments(self, command):
     type: group
     short-summary: A group.
 """
-        self.cli_ctx = TestCLI(commands_loader_cls=DeprecationTestCommandLoader)
+        self.cli_ctx = DummyCLI(commands_loader_cls=DeprecationTestCommandLoader)
 
     @redirect_io
     def test_deprecate_command_group_help_plain(self):
@@ -294,7 +294,7 @@ def load_arguments(self, command):
     type: group
     short-summary: A group.
 """
-        self.cli_ctx = TestCLI(commands_loader_cls=DeprecationTestCommandLoader)
+        self.cli_ctx = DummyCLI(commands_loader_cls=DeprecationTestCommandLoader)
 
     @redirect_io
     def test_deprecate_arguments_command_help(self):