Skip to content

Commit 69f49a8

Browse files
authored
Merge pull request #1100 from onekey-sec/export-rust-types
Export rust types
2 parents bdb87c8 + 2c7d241 commit 69f49a8

File tree

4 files changed

+12
-8
lines changed

4 files changed

+12
-8
lines changed

python/unblob/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from unblob._rust import math_tools as math_tools

python/unblob/processing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import plotext as plt
1111
from structlog import get_logger
1212

13-
from unblob._rust import math_tools as mt
13+
from unblob import math_tools as mt
1414
from unblob.handlers import BUILTIN_DIR_HANDLERS, BUILTIN_HANDLERS, Handlers
1515

1616
from .extractor import carve_unknown_chunk, carve_valid_chunk, fix_extracted_directory

python/unblob/sandbox.py

+9-6
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,20 @@
77

88
from structlog import get_logger
99

10-
from unblob._rust.sandbox import (
11-
AccessFS,
12-
SandboxError,
13-
restrict_access,
14-
)
15-
1610
if sys.version_info >= (3, 10):
1711
from typing import ParamSpec
1812
else:
1913
from typing_extensions import ParamSpec
2014

15+
from unblob._rust.sandbox import (
16+
AccessFS as AccessFS,
17+
)
18+
from unblob._rust.sandbox import (
19+
SandboxError as SandboxError,
20+
)
21+
from unblob._rust.sandbox import (
22+
restrict_access as restrict_access,
23+
)
2124
from unblob.processing import ExtractionConfig
2225

2326
logger = get_logger()

python/unblob/testing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
from lark.visitors import Discard, Transformer
1313
from pytest_cov.embed import cleanup_on_sigterm
1414

15-
from unblob._rust.sandbox import AccessFS, SandboxError, restrict_access
1615
from unblob.finder import build_hyperscan_database
1716
from unblob.logging import configure_logger
1817
from unblob.models import ProcessResult
1918
from unblob.processing import ExtractionConfig
2019
from unblob.report import ExtractCommandFailedReport
20+
from unblob.sandbox import AccessFS, SandboxError, restrict_access
2121

2222

2323
@pytest.fixture(scope="session", autouse=True)

0 commit comments

Comments
 (0)