Skip to content

Commit 5dea934

Browse files
committed
enable isort with black profile
1 parent badb2da commit 5dea934

File tree

267 files changed

+579
-680
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

267 files changed

+579
-680
lines changed

.pre-commit-config.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,8 @@ repos:
4747
# todo: replace black with this?
4848
# Run the formatter.
4949
# - id: ruff-format
50+
- repo: https://github.com/pycqa/isort
51+
rev: 5.13.2
52+
hooks:
53+
- id: isort
54+
args: ["--profile", "black"]

ci_tests/test_pygoat_findings.py

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import pytest
44

5-
65
EXPECTED_FINDINGS = [
76
"pixee:python/add-requests-timeouts",
87
"pixee:python/secure-random",

integration_tests/test_add_requests_timeout.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from core_codemods.add_requests_timeouts import (
2-
AddRequestsTimeouts,
3-
TransformAddRequestsTimeouts,
4-
)
51
from codemodder.codemods.test import (
62
BaseIntegrationTest,
73
original_and_expected_from_code_path,
84
)
5+
from core_codemods.add_requests_timeouts import (
6+
AddRequestsTimeouts,
7+
TransformAddRequestsTimeouts,
8+
)
99

1010

1111
class TestAddRequestsTimeouts(BaseIntegrationTest):

integration_tests/test_combine_startswith_endswith.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.combine_startswith_endswith import CombineStartswithEndswith
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.combine_startswith_endswith import CombineStartswithEndswith
66

77

88
class TestCombineStartswithEndswith(BaseIntegrationTest):

integration_tests/test_dependency_manager.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import os
2-
import subprocess
32
import shutil
3+
import subprocess
4+
from textwrap import dedent
5+
46
import pytest
7+
58
from codemodder.codemods.test.integration_utils import SAMPLES_DIR, CleanRepoMixin
6-
from textwrap import dedent
79

810

911
class TestDependencyManager(CleanRepoMixin):

integration_tests/test_django_debug_flag_on.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.django_debug_flag_on import DjangoDebugFlagOn
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.django_debug_flag_on import DjangoDebugFlagOn
66

77

88
class TestDjangoDebugFlagFlip(BaseIntegrationTest):

integration_tests/test_django_json_response_type.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from core_codemods.django_json_response_type import (
2-
DjangoJsonResponseType,
3-
DjangoJsonResponseTypeTransformer,
4-
)
51
from codemodder.codemods.test import (
62
BaseIntegrationTest,
73
original_and_expected_from_code_path,
84
)
5+
from core_codemods.django_json_response_type import (
6+
DjangoJsonResponseType,
7+
DjangoJsonResponseTypeTransformer,
8+
)
99

1010

1111
class TestDjangoJsonResponseType(BaseIntegrationTest):

integration_tests/test_django_model_without_dunder_str.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from core_codemods.django_model_without_dunder_str import (
2-
DjangoModelWithoutDunderStr,
3-
DjangoModelWithoutDunderStrTransformer,
4-
)
51
from codemodder.codemods.test import (
62
BaseIntegrationTest,
73
original_and_expected_from_code_path,
84
)
5+
from core_codemods.django_model_without_dunder_str import (
6+
DjangoModelWithoutDunderStr,
7+
DjangoModelWithoutDunderStrTransformer,
8+
)
99

1010

1111
class TestDjangoModelWithoutDunderStr(BaseIntegrationTest):

integration_tests/test_django_receiver_on_top.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from core_codemods.django_receiver_on_top import (
2-
DjangoReceiverOnTop,
3-
DjangoReceiverOnTopTransformer,
4-
)
51
from codemodder.codemods.test import (
62
BaseIntegrationTest,
73
original_and_expected_from_code_path,
84
)
5+
from core_codemods.django_receiver_on_top import (
6+
DjangoReceiverOnTop,
7+
DjangoReceiverOnTopTransformer,
8+
)
99

1010

1111
class TestDjangoReceiverOnTop(BaseIntegrationTest):

integration_tests/test_django_session_cookie_secure_off.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
from core_codemods.django_session_cookie_secure_off import (
2-
DjangoSessionCookieSecureOff,
3-
)
41
from codemodder.codemods.test import (
52
BaseIntegrationTest,
63
original_and_expected_from_code_path,
74
)
5+
from core_codemods.django_session_cookie_secure_off import DjangoSessionCookieSecureOff
86

97

108
class TestDjangoSessionCookieSecureOff(BaseIntegrationTest):

integration_tests/test_exception_without_raise.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from core_codemods.exception_without_raise import (
2-
ExceptionWithoutRaise,
3-
ExceptionWithoutRaiseTransformer,
4-
)
51
from codemodder.codemods.test import (
62
BaseIntegrationTest,
73
original_and_expected_from_code_path,
84
)
5+
from core_codemods.exception_without_raise import (
6+
ExceptionWithoutRaise,
7+
ExceptionWithoutRaiseTransformer,
8+
)
99

1010

1111
class TestExceptionWithoutRaise(BaseIntegrationTest):

integration_tests/test_file_resource_leak.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from core_codemods.file_resource_leak import (
2-
FileResourceLeak,
3-
FileResourceLeakTransformer,
4-
)
51
from codemodder.codemods.test import (
62
BaseIntegrationTest,
73
original_and_expected_from_code_path,
84
)
5+
from core_codemods.file_resource_leak import (
6+
FileResourceLeak,
7+
FileResourceLeakTransformer,
8+
)
99

1010

1111
class TestFileResourceLeak(BaseIntegrationTest):

integration_tests/test_fix_assert_tuple.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.fix_assert_tuple import FixAssertTuple, FixAssertTupleTransform
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.fix_assert_tuple import FixAssertTuple, FixAssertTupleTransform
66

77

88
class TestFixAssertTuple(BaseIntegrationTest):

integration_tests/test_fix_deprecated_abstractproperty.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
from textwrap import dedent
22

3-
from core_codemods.fix_deprecated_abstractproperty import FixDeprecatedAbstractproperty
43
from codemodder.codemods.test import (
54
BaseIntegrationTest,
65
original_and_expected_from_code_path,
76
)
7+
from core_codemods.fix_deprecated_abstractproperty import FixDeprecatedAbstractproperty
88

99

1010
class TestFixDeprecatedAbstractproperty(BaseIntegrationTest):

integration_tests/test_fix_deprecated_logging_warn.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.fix_deprecated_logging_warn import FixDeprecatedLoggingWarn
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.fix_deprecated_logging_warn import FixDeprecatedLoggingWarn
66

77

88
class TestFixDeprecatedLoggingWarn(BaseIntegrationTest):

integration_tests/test_fix_empty_sequence_comparison.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.fix_empty_sequence_comparison import FixEmptySequenceComparison
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.fix_empty_sequence_comparison import FixEmptySequenceComparison
66

77

88
class TestFixEmptySequenceComparison(BaseIntegrationTest):

integration_tests/test_fix_mutable_params.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from core_codemods.fix_mutable_params import (
2-
FixMutableParams,
3-
FixMutableParamsTransformer,
4-
)
51
from codemodder.codemods.test import (
62
BaseIntegrationTest,
73
original_and_expected_from_code_path,
84
)
5+
from core_codemods.fix_mutable_params import (
6+
FixMutableParams,
7+
FixMutableParamsTransformer,
8+
)
99

1010

1111
class TestFixMutableParams(BaseIntegrationTest):

integration_tests/test_fix_task_instantiation.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.fix_async_task_instantiation import FixAsyncTaskInstantiation
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.fix_async_task_instantiation import FixAsyncTaskInstantiation
66

77

88
class TestFixAsyncTaskInstantiation(BaseIntegrationTest):

integration_tests/test_flask_enable_csrf_protection.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from core_codemods.flask_enable_csrf_protection import FlaskEnableCSRFProtection
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
65
from codemodder.dependency import FlaskWTF
6+
from core_codemods.flask_enable_csrf_protection import FlaskEnableCSRFProtection
77

88

99
class TestFlaskEnableCSRFProtection(BaseIntegrationTest):

integration_tests/test_flask_json_response_type.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from core_codemods.flask_json_response_type import (
2-
FlaskJsonResponseType,
3-
FlaskJsonResponseTypeTransformer,
4-
)
51
from codemodder.codemods.test import (
62
BaseIntegrationTest,
73
original_and_expected_from_code_path,
84
)
5+
from core_codemods.flask_json_response_type import (
6+
FlaskJsonResponseType,
7+
FlaskJsonResponseTypeTransformer,
8+
)
99

1010

1111
class TestFlaskJsonResponseType(BaseIntegrationTest):

integration_tests/test_harden_pyyaml.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import yaml
2-
from core_codemods.harden_pyyaml import HardenPyyaml
2+
33
from codemodder.codemods.test import (
44
BaseIntegrationTest,
55
original_and_expected_from_code_path,
66
)
7+
from core_codemods.harden_pyyaml import HardenPyyaml
78

89

910
class TestHardenPyyaml(BaseIntegrationTest):

integration_tests/test_harden_ruamel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.harden_ruamel import HardenRuamel
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.harden_ruamel import HardenRuamel
66

77

88
class TestHardenRuamel(BaseIntegrationTest):

integration_tests/test_https_connection.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.https_connection import HTTPSConnection
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.https_connection import HTTPSConnection
66

77

88
class TestHTTPSConnection(BaseIntegrationTest):

integration_tests/test_jinja2_autoescape.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.enable_jinja2_autoescape import EnableJinja2Autoescape
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.enable_jinja2_autoescape import EnableJinja2Autoescape
66

77

88
class TestEnableJinja2Autoescape(BaseIntegrationTest):

integration_tests/test_jwt_decode_verify.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.jwt_decode_verify import JwtDecodeVerify, JwtDecodeVerifyTransformer
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.jwt_decode_verify import JwtDecodeVerify, JwtDecodeVerifyTransformer
66

77

88
class TestJwtDecodeVerify(BaseIntegrationTest):

integration_tests/test_lazy_logging.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.lazy_logging import LazyLogging
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.lazy_logging import LazyLogging
66

77

88
class TestLazyLogging(BaseIntegrationTest):

integration_tests/test_limit_readline.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.limit_readline import LimitReadline
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.limit_readline import LimitReadline
66

77

88
class TestLimitReadline(BaseIntegrationTest):

integration_tests/test_literal_or_new_object_identity.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from core_codemods.literal_or_new_object_identity import (
2-
LiteralOrNewObjectIdentity,
3-
LiteralOrNewObjectIdentityTransformer,
4-
)
51
from codemodder.codemods.test import (
62
BaseIntegrationTest,
73
original_and_expected_from_code_path,
84
)
5+
from core_codemods.literal_or_new_object_identity import (
6+
LiteralOrNewObjectIdentity,
7+
LiteralOrNewObjectIdentityTransformer,
8+
)
99

1010

1111
class TestLiteralOrNewObjectIdentity(BaseIntegrationTest):

integration_tests/test_lxml_safe_parser_defaults.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.lxml_safe_parser_defaults import LxmlSafeParserDefaults
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.lxml_safe_parser_defaults import LxmlSafeParserDefaults
66

77

88
class TestLxmlSafeParserDefaults(BaseIntegrationTest):

integration_tests/test_lxml_safe_parsing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.lxml_safe_parsing import LxmlSafeParsing
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.lxml_safe_parsing import LxmlSafeParsing
66

77

88
class TestLxmlSafeParsing(BaseIntegrationTest):

integration_tests/test_numpy_nan_equality.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
from core_codemods.numpy_nan_equality import (
2-
NumpyNanEquality,
3-
NumpyNanEqualityTransformer,
4-
)
51
from codemodder.codemods.test import (
62
BaseIntegrationTest,
73
original_and_expected_from_code_path,
84
)
5+
from core_codemods.numpy_nan_equality import (
6+
NumpyNanEquality,
7+
NumpyNanEqualityTransformer,
8+
)
99

1010

1111
class TestNumpyNanEquality(BaseIntegrationTest):

integration_tests/test_order_imports.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
from core_codemods.order_imports import OrderImports
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
5+
from core_codemods.order_imports import OrderImports
66

77

88
class TestOrderImports(BaseIntegrationTest):

integration_tests/test_process_sandbox.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
from core_codemods.process_creation_sandbox import ProcessSandbox
21
from codemodder.codemods.test import (
32
BaseIntegrationTest,
43
original_and_expected_from_code_path,
54
)
65
from codemodder.dependency import Security
6+
from core_codemods.process_creation_sandbox import ProcessSandbox
77

88

99
class TestProcessSandbox(BaseIntegrationTest):

0 commit comments

Comments
 (0)