Skip to content

Commit 8e5f43d

Browse files
committed
fix doc and mv file to structs for future extensibility
1 parent b5a1ca8 commit 8e5f43d

9 files changed

+10
-9
lines changed

pwn/toplevel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
from pwnlib.exception import PwnlibException
3232
from pwnlib.gdb import attach, debug_assembly, debug_shellcode
3333
from pwnlib.filesystem import *
34-
from pwnlib.file import *
34+
from pwnlib.structs import *
3535
from pwnlib.flag import *
3636
from pwnlib.fmtstr import FmtStr, fmtstr_payload, fmtstr_split
3737
from pwnlib.log import getLogger

pwnlib/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
'encoders',
1919
'elf',
2020
'exception',
21-
'file',
21+
'structs',
2222
'fmtstr',
2323
'gdb',
2424
'libcdb',

pwnlib/file/__init__.py

-5
This file was deleted.

pwnlib/filepointer.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
from __future__ import absolute_import
12
# This is a fallback support for filepointer mudule
2-
from pwnlib.file.filepointer import *
3+
from pwnlib.structs.filepointer import *

pwnlib/structs/__init__.py

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
from __future__ import absolute_import
2+
3+
from pwnlib.structs.filepointer import *
4+
from pwnlib.structs.widedata import *
5+
from pwnlib.structs.jumptable import *
File renamed without changes.
File renamed without changes.
File renamed without changes.

pwnlib/util/packing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1210,7 +1210,7 @@ def overlap_structure(*structs):
12101210
Parameters:
12111211
structs: ``str``, ``bytes`` and ``list[int]`` are all acceptable,
12121212
as long as the argument is "len-able", iterable and serving ints.
1213-
Note ``str``s will be used as ``bytes`` object.
1213+
Note ``str`` will be used as ``bytes`` object.
12141214
12151215
Raises:
12161216
ValueError: 2 non-zero values on the same index. Carry `msg` of

0 commit comments

Comments
 (0)