Skip to content

Commit

Permalink
fix doc and mv file to structs for future extensibility
Browse files Browse the repository at this point in the history
  • Loading branch information
RocketMaDev committed Aug 20, 2024
1 parent b5a1ca8 commit 8e5f43d
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pwn/toplevel.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
from pwnlib.exception import PwnlibException
from pwnlib.gdb import attach, debug_assembly, debug_shellcode
from pwnlib.filesystem import *
from pwnlib.file import *
from pwnlib.structs import *
from pwnlib.flag import *
from pwnlib.fmtstr import FmtStr, fmtstr_payload, fmtstr_split
from pwnlib.log import getLogger
Expand Down
2 changes: 1 addition & 1 deletion pwnlib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
'encoders',
'elf',
'exception',
'file',
'structs',
'fmtstr',
'gdb',
'libcdb',
Expand Down
5 changes: 0 additions & 5 deletions pwnlib/file/__init__.py

This file was deleted.

3 changes: 2 additions & 1 deletion pwnlib/filepointer.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
from __future__ import absolute_import
# This is a fallback support for filepointer mudule
from pwnlib.file.filepointer import *
from pwnlib.structs.filepointer import *
5 changes: 5 additions & 0 deletions pwnlib/structs/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
from __future__ import absolute_import

from pwnlib.structs.filepointer import *
from pwnlib.structs.widedata import *
from pwnlib.structs.jumptable import *
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion pwnlib/util/packing.py
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ def overlap_structure(*structs):
Parameters:
structs: ``str``, ``bytes`` and ``list[int]`` are all acceptable,
as long as the argument is "len-able", iterable and serving ints.
Note ``str``s will be used as ``bytes`` object.
Note ``str`` will be used as ``bytes`` object.
Raises:
ValueError: 2 non-zero values on the same index. Carry `msg` of
Expand Down

0 comments on commit 8e5f43d

Please sign in to comment.