reduce diff

Author: mshafer-NI

ni_python_styleguide/_cli.py

@@ -1,4 +1,3 @@
-import logging
 import pathlib
 import sys
 import typing
@@ -8,9 +7,6 @@
 
 from ni_python_styleguide import _acknowledge_existing_errors, _fix, _Flake8Error, _lint
 
-_logger = logging.getLogger(__name__)
-_logger.addHandler(logging.NullHandler())
-
 
 def _qs_or_vs(verbosity):
     if verbosity != 0:
@@ -161,17 +157,13 @@ def acknowledge_existing_violations(obj, extend_ignore, file_or_dir, aggressive)
 
     Use this command to acknowledge violations in existing code to allow for enforcing new code.
     """
-    try:
-        _acknowledge_existing_errors.acknowledge_lint_errors(
-            exclude=obj["EXCLUDE"],
-            app_import_names=obj["APP_IMPORT_NAMES"],
-            extend_ignore=extend_ignore,
-            file_or_dir=file_or_dir,
-            aggressive=aggressive,
-        )
-    except Exception as e:
-        _logger.debug(e, exc_info=True)
-        raise click.ClickException(f"Error occurred: {e}")
+    _acknowledge_existing_errors.acknowledge_lint_errors(
+        exclude=obj["EXCLUDE"],
+        app_import_names=obj["APP_IMPORT_NAMES"],
+        extend_ignore=extend_ignore,
+        file_or_dir=file_or_dir,
+        aggressive=aggressive,
+    )
 
 
 @main.command()
@@ -189,17 +181,13 @@ def acknowledge_existing_violations(obj, extend_ignore, file_or_dir, aggressive)
 @click.pass_obj
 def fix(obj, extend_ignore: typing.Optional[str], file_or_dir, aggressive):
     """Fix basic linter/formatting errors in file(s)/directory(s) given."""
-    try:
-        _fix.fix(
-            exclude=obj["EXCLUDE"],
-            app_import_names=obj["APP_IMPORT_NAMES"],
-            extend_ignore=extend_ignore,
-            file_or_dir=file_or_dir or [pathlib.Path.cwd()],
-            aggressive=aggressive,
-        )
-    except Exception as e:
-        _logger.debug(e, exc_info=True)
-        raise click.ClickException(f"Error occurred: {e}")
+    _fix.fix(
+        exclude=obj["EXCLUDE"],
+        app_import_names=obj["APP_IMPORT_NAMES"],
+        extend_ignore=extend_ignore,
+        file_or_dir=file_or_dir or [pathlib.Path.cwd()],
+        aggressive=aggressive,
+    )
 
 
 @main.command()
@@ -209,16 +197,12 @@ def fix(obj, extend_ignore: typing.Optional[str], file_or_dir, aggressive):
 @click.pass_obj
 def format(obj, file_or_dir, check: bool, diff: bool):
     """Format the file(s)/directory(s) given."""
-    try:
-        _fix.fix(
-            exclude=obj["EXCLUDE"],
-            app_import_names=obj["APP_IMPORT_NAMES"],
-            extend_ignore=None,
-            file_or_dir=file_or_dir or [pathlib.Path.cwd()],
-            aggressive=False,
-            check=check,
-            diff=diff,
-        )
-    except Exception as e:
-        _logger.debug(e, exc_info=True)
-        raise click.ClickException(f"Error occurred: {e}")
+    _fix.fix(
+        exclude=obj["EXCLUDE"],
+        app_import_names=obj["APP_IMPORT_NAMES"],
+        extend_ignore=None,
+        file_or_dir=file_or_dir or [pathlib.Path.cwd()],
+        aggressive=False,
+        check=check,
+        diff=diff,
+    )

ni_python_styleguide/_utils/__init__.py

@@ -1,7 +1,6 @@
-from . import _constants
 from . import code_analysis  # noqa: F401
 from . import lint  # noqa: F401
 from . import string_helpers  # noqa: F401
 from . import temp_file  # noqa: F401
 
-DEFAULT_ENCODING = _constants.DEFAULT_ENCODING
+DEFAULT_ENCODING = "UTF-8"