Skip to content

Commit

Permalink
Add I lints
Browse files Browse the repository at this point in the history
  • Loading branch information
twizmwazin committed Jun 20, 2024
1 parent da23895 commit 86a6c45
Show file tree
Hide file tree
Showing 53 changed files with 192 additions and 168 deletions.
10 changes: 5 additions & 5 deletions claripy/ast/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
import weakref
from collections import OrderedDict, deque
from itertools import chain
from typing import Optional, Generic, TypeVar, TYPE_CHECKING, List, Iterable, Iterator, Tuple, NoReturn
from claripy.errors import BackendError, ClaripyOperationError, ClaripyReplacementError
from claripy import operations
from typing import TYPE_CHECKING, Generic, Iterable, Iterator, List, NoReturn, Optional, Tuple, TypeVar

from claripy import operations, simplifications
from claripy.backend_manager import backends
from claripy import simplifications
from claripy.errors import BackendError, ClaripyOperationError, ClaripyReplacementError

if TYPE_CHECKING:
from claripy.annotation import Annotation
Expand Down Expand Up @@ -1349,5 +1349,5 @@ def simplify(e: T) -> T:
return s


from claripy.ast.bool import If, Not, BoolS # noqa: E402
from claripy.ast.bool import BoolS, If, Not # noqa: E402
from claripy.ast.bv import BV # noqa: E402
7 changes: 4 additions & 3 deletions claripy/ast/bool.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import atexit
import logging

from claripy.ast.base import Base, _make_name, ASTCacheKey
from claripy.backend_manager import backends
from claripy import operations
from claripy.errors import ClaripyOperationError, ClaripyTypeError, BackendError
from claripy.ast.base import ASTCacheKey, Base, _make_name
from claripy.backend_manager import backends
from claripy.errors import BackendError, ClaripyOperationError, ClaripyTypeError

from .bits import Bits

l = logging.getLogger("claripy.ast.bool")
Expand Down
11 changes: 5 additions & 6 deletions claripy/ast/bv.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
import numbers
import weakref

from .bits import Bits
from claripy import operations, vsa
from claripy.ast.base import _make_name
from .bool import If
from claripy.utils import deprecated
from claripy.errors import ClaripyValueError
from .bool import Bool
from claripy import operations
from claripy import vsa
from claripy.utils import deprecated

from .bits import Bits
from .bool import Bool, If

l = logging.getLogger("claripy.ast.bv")

Expand Down
7 changes: 4 additions & 3 deletions claripy/ast/bv.pyi
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
from typing import overload, Any
from typing import Any, overload

from claripy.bv import BVV as ConcreteBVV
from claripy.fp import RM, FSort

from .bits import Bits
from .bool import Bool
from .fp import FP
from claripy.bv import BVV as ConcreteBVV
from claripy.fp import RM, FSort

CoerceBV = int | "BV"
Incomplete = Any
Expand Down
8 changes: 4 additions & 4 deletions claripy/ast/fp.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import struct

from .bits import Bits
from claripy import fp, operations
from claripy.ast.base import _make_name
from claripy.fp import FSORT_FLOAT
from claripy import operations
from claripy import fp
from .bv import BV

from .bits import Bits
from .bool import Bool
from .bv import BV


class FP(Bits):
Expand Down
4 changes: 2 additions & 2 deletions claripy/ast/strings.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
from typing import Optional

from .bits import Bits
from claripy import operations
from claripy.ast.base import _make_name

from claripy import operations
from .bits import Bits
from .bool import Bool
from .bv import BV, BVS, BVV

Expand Down
9 changes: 5 additions & 4 deletions claripy/backends/backend_concrete.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@
import operator
from functools import reduce

from . import BackendError, Backend
from claripy.operations import backend_operations, backend_fp_operations, backend_strings_operations
from claripy import bv, fp, strings
from claripy.ast import Base
from claripy.ast.bool import Bool, BoolV
from claripy.ast.bv import BV, BVV
from claripy.ast.strings import StringV
from claripy.ast.fp import FPV
from claripy.ast.bool import Bool, BoolV
from claripy.ast.strings import StringV
from claripy.errors import UnsatError
from claripy.operations import backend_fp_operations, backend_operations, backend_strings_operations

from . import Backend, BackendError

l = logging.getLogger("claripy.backends.backend_concrete")

Expand Down
45 changes: 22 additions & 23 deletions claripy/backends/backend_smtlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,36 @@
import logging

from pysmt.shortcuts import (
Symbol,
String,
StrConcat,
NotEquals,
StrSubstr,
Int,
StrLength,
StrReplace,
GE,
GT,
LE,
LT,
And,
Bool,
EqualsOrIff,
Int,
IntToStr,
Ite,
Minus,
Not,
NotEquals,
Or,
LT,
LE,
GT,
GE,
Plus,
StrConcat,
StrContains,
StrIndexOf,
String,
StrLength,
StrPrefixOf,
StrReplace,
StrSubstr,
StrSuffixOf,
StrIndexOf,
StrToInt,
Ite,
EqualsOrIff,
Minus,
Plus,
IntToStr,
Not,
And,
Symbol,
)
from pysmt.typing import BOOL, INT, STRING

from pysmt.typing import STRING, INT, BOOL
from . import BackendError, Backend

from . import Backend, BackendError

l = logging.getLogger("claripy.backends.backend_smt")

Expand Down
7 changes: 4 additions & 3 deletions claripy/backends/backend_smtlib_solvers/abc_popen.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import subprocess
import logging
import subprocess

from . import SMTLibSolverBackend, PopenSolverProxy
from claripy.errors import MissingSolverError
from claripy import backend_manager as backend_manager
from claripy.errors import MissingSolverError

from . import PopenSolverProxy, SMTLibSolverBackend

log = logging.getLogger(__name__)

Expand Down
9 changes: 5 additions & 4 deletions claripy/backends/backend_smtlib_solvers/cvc4_popen.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import subprocess
import logging

import re
from . import SMTLibSolverBackend, PopenSolverProxy
from claripy.errors import MissingSolverError
import subprocess

from claripy import backend_manager as backend_manager
from claripy.errors import MissingSolverError

from . import PopenSolverProxy, SMTLibSolverBackend

log = logging.getLogger(__name__)

Expand Down
9 changes: 5 additions & 4 deletions claripy/backends/backend_smtlib_solvers/z3_popen.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import subprocess
import logging

import re
from . import SMTLibSolverBackend, PopenSolverProxy
from claripy.errors import MissingSolverError
import subprocess

from claripy import backend_manager as backend_manager
from claripy.errors import MissingSolverError

from . import PopenSolverProxy, SMTLibSolverBackend

log = logging.getLogger(__name__)

Expand Down
9 changes: 5 additions & 4 deletions claripy/backends/backend_smtlib_solvers/z3str_popen.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import subprocess
import logging

import re
from . import SMTLibSolverBackend, PopenSolverProxy
from claripy.errors import MissingSolverError
import subprocess

from claripy import backend_manager as backend_manager
from claripy.errors import MissingSolverError

from . import PopenSolverProxy, SMTLibSolverBackend

log = logging.getLogger(__name__)

Expand Down
19 changes: 9 additions & 10 deletions claripy/backends/backend_vsa.py
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
import functools
import logging
import numbers
import functools
import operator
from functools import reduce


from . import Backend, BackendError
from claripy.vsa import RegionAnnotation

from claripy.ast.base import Base
from claripy.balancer import Balancer
from claripy.operations import backend_operations_vsa_compliant, expression_set_operations
from claripy.vsa import (
StridedInterval,
BoolResult,
CreateStridedInterval,
DiscreteStridedIntervalSet,
ValueSet,
BoolResult,
TrueResult,
FalseResult,
RegionAnnotation,
StridedInterval,
TrueResult,
ValueSet,
)
from claripy.balancer import Balancer

from . import Backend, BackendError

l = logging.getLogger("claripy.backends.backend_vsa")

Expand Down
31 changes: 18 additions & 13 deletions claripy/backends/backend_z3.py
Original file line number Diff line number Diff line change
@@ -1,30 +1,35 @@
import os
import sys
import ctypes
import logging
import numbers
import operator
import os
import signal
import sys
import threading
import weakref
import signal
from functools import reduce
from decimal import Decimal
import z3
from functools import reduce

import z3
from cachetools import LRUCache

from claripy.errors import ClaripyZ3Error, ClaripySolverInterruptError
from claripy import _all_operations
from claripy.ast.base import Base
from claripy.ast.bool import Bool, BoolV
from claripy.ast.bv import BV, BVV
from claripy.ast.bool import BoolV, Bool
from claripy.ast.strings import StringV
from claripy.ast.fp import FP, FPV
from claripy.operations import backend_operations, backend_fp_operations, backend_strings_operations
from claripy.fp import FSort, RM
from claripy.errors import ClaripyError, BackendError, ClaripyOperationError
from claripy import _all_operations
from . import Backend
from claripy.ast.strings import StringV
from claripy.errors import (
BackendError,
ClaripyError,
ClaripyOperationError,
ClaripySolverInterruptError,
ClaripyZ3Error,
)
from claripy.fp import RM, FSort
from claripy.operations import backend_fp_operations, backend_operations, backend_strings_operations

from . import Backend

l = logging.getLogger("claripy.backends.backend_z3")

Expand Down
1 change: 1 addition & 0 deletions claripy/backends/backend_z3_parallel.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import threading

from claripy.errors import ClaripyError, UnsatError

from .backend_z3 import BackendZ3

num_children = 0
Expand Down
11 changes: 5 additions & 6 deletions claripy/balancer.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
from typing import Set
import logging
import operator
from typing import Set

from .errors import ClaripyBalancerError, ClaripyBalancerUnsatError, ClaripyOperationError, BackendError
from . import _all_operations, vsa
from .ast.base import Base
from .ast.bool import Bool
from .ast.bv import BVV, BVS, BV
from . import _all_operations
from .ast.bv import BV, BVS, BVV
from .backend_manager import backends
from . import vsa
from .operations import opposites, commutative_operations
from .errors import BackendError, ClaripyBalancerError, ClaripyBalancerUnsatError, ClaripyOperationError
from .operations import commutative_operations, opposites

l = logging.getLogger("claripy.balancer")

Expand Down
4 changes: 2 additions & 2 deletions claripy/bv.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import functools
import numbers

from .errors import ClaripyOperationError, ClaripyTypeError, ClaripyZeroDivisionError
from .backend_object import BackendObject
from . import debug as _d
from .backend_object import BackendObject
from .errors import ClaripyOperationError, ClaripyTypeError, ClaripyZeroDivisionError


def compare_bits(f):
Expand Down
2 changes: 1 addition & 1 deletion claripy/fp.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
from decimal import Decimal
from enum import Enum

from .errors import ClaripyOperationError
from .backend_object import BackendObject
from .bv import BVV, Concat
from .errors import ClaripyOperationError


def compare_sorts(f):
Expand Down
1 change: 1 addition & 0 deletions claripy/frontend_mixins/constraint_expansion_mixin.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import logging

from claripy.ast.bool import Or
from claripy.ast.bv import SGE, SLE, UGE, ULE

Expand Down
2 changes: 1 addition & 1 deletion claripy/frontend_mixins/constraint_filter_mixin.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from claripy.errors import UnsatError, ClaripyValueError
from claripy import false
from claripy.errors import ClaripyValueError, UnsatError


class ConstraintFilterMixin:
Expand Down
Loading

0 comments on commit 86a6c45

Please sign in to comment.