From 4a39e37e19fe02be9169d8a37ee09190acd09527 Mon Sep 17 00:00:00 2001 From: Malfurious Date: Fri, 12 Jan 2024 07:37:53 -0500 Subject: builder: Rename package to payload and expose contents This follows in the package contents export change. Additionally, the builder package is renamed to "payload". "payload" is actually the preferred name of this package. It was previously renamed due to the absurdity of importing "sploit.payload.payload.Payload()", and the fact that additional modules were being bundled together so a more broad name _seemed_ desirable. Signed-off-by: Malfurious --- sploit/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sploit/__init__.py') diff --git a/sploit/__init__.py b/sploit/__init__.py index 1eb570c..f761ead 100644 --- a/sploit/__init__.py +++ b/sploit/__init__.py @@ -1,8 +1,8 @@ from sploit import ( arch, - builder, comm, log, + payload, rev, symtbl, until, -- cgit v1.2.3 From 074a15310b8bbeeeeb00bf5ab5877c12f1ca1861 Mon Sep 17 00:00:00 2001 From: Malfurious Date: Fri, 12 Jan 2024 16:26:03 -0500 Subject: log: Move to sploit.util package Signed-off-by: Malfurious --- sploit/__init__.py | 1 - 1 file changed, 1 deletion(-) (limited to 'sploit/__init__.py') diff --git a/sploit/__init__.py b/sploit/__init__.py index f761ead..f443fe9 100644 --- a/sploit/__init__.py +++ b/sploit/__init__.py @@ -1,7 +1,6 @@ from sploit import ( arch, comm, - log, payload, rev, symtbl, -- cgit v1.2.3 From 67b5a873a2f6f506fc0450fcb22b58f3e6612dc0 Mon Sep 17 00:00:00 2001 From: Malfurious Date: Sat, 13 Jan 2024 14:59:20 -0500 Subject: sploit: Expose modules' contents through package This completes the overarching package reorganization changes. The contents of the top-level "sploit" package's direct children modules are exported via the package. Explicit imports for sploit's subpackages are not necessary. Other package __init__.py files are using relative imports. However, doing so here causes the hatchling build process to fail. Fortunately, since this is the top level, absolute paths aren't too long. The last few modules left in this package have been kept back since they lack any specific niche, are considered "universally relevant", or are typically imported so frequently that it makes sense to provide them to scripts automatically. Signed-off-by: Malfurious --- sploit/__init__.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'sploit/__init__.py') diff --git a/sploit/__init__.py b/sploit/__init__.py index f443fe9..dc5943f 100644 --- a/sploit/__init__.py +++ b/sploit/__init__.py @@ -1,11 +1,6 @@ -from sploit import ( - arch, - comm, - payload, - rev, - symtbl, - until, - util, -) +from sploit.arch import * +from sploit.symtbl import * +from sploit.until import * -__version__ = util.git_version() +from sploit.util import git_version as __git_version +__version__ = __git_version() -- cgit v1.2.3