From 2583ec4a807ed503405925ee8e74418793af9f6b Mon Sep 17 00:00:00 2001 From: k4lizen <124312252+k4lizen@users.noreply.github.com> Date: Thu, 21 Mar 2024 03:17:25 -0400 Subject: [PATCH] python2.7 support --- pwnlib/tubes/process.py | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/pwnlib/tubes/process.py b/pwnlib/tubes/process.py index d1921b1d3..0b9d653f0 100644 --- a/pwnlib/tubes/process.py +++ b/pwnlib/tubes/process.py @@ -12,7 +12,7 @@ import subprocess import sys import time -from typing import NamedTuple +from collections import namedtuple IS_WINDOWS = sys.platform.startswith('win') @@ -46,9 +46,7 @@ class PTY(object): pass signal_names = {-v:k for k,v in signal.__dict__.items() if k.startswith('SIG')} # used by get_mapping_location and friends -class mapping_location(NamedTuple): - address: int - size: int +mapping_location = namedtuple("mapping_location", "address size") class process(tube): r""" @@ -915,28 +913,10 @@ def maps(self): pmmap_ext(addr='15555551c000-155555520000', perms='r--p', path='[vvar]', rss=0, size=16384, pss=0, shared_clean=0, shared_dirty=0, private_clean=0, private_dirty=0, referenced=0, anonymous=0, swap=0) """ - class permissions(NamedTuple): - read: bool - write: bool - execute: bool - string: str - class mapping(NamedTuple): - addr: int - address: int # alias for addr - start: int # alias for addr - end: int # addr + size - size: int - perms: permissions - path: str - rss: int - pss: int - shared_clean: int # some of these should probably be bools - shared_dirty: int - private_clean: int - private_dirty: int - referenced: int - anonymous: int - swap: int + permissions = namedtuple("permissions", "read write execute string") + mapping = namedtuple("mapping", + "addr address start end size perms path rss pss shared_clean shared_dirty private_clean private_dirty referenced anonymous swap") + # addr = address (alias) = start (alias) from pwnlib.util.proc import memory_maps raw_maps = memory_maps(self.pid)