From efe6c8b14844199bf43a461c3709139398cddfbb Mon Sep 17 00:00:00 2001 From: Zach Riggle Date: Fri, 10 Feb 2017 14:00:07 -0500 Subject: [PATCH] Sort inputs --- gdbinit.py | 5 +++-- ida_script.py | 4 ++-- pwndbg/commands/stack.py | 6 ++++++ pwndbg/elftypes.py | 3 ++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/gdbinit.py b/gdbinit.py index d02dc6e7b..936c19261 100644 --- a/gdbinit.py +++ b/gdbinit.py @@ -3,11 +3,12 @@ from __future__ import print_function from __future__ import unicode_literals -import sys -import six import locale +import sys from os import path +import six + directory, file = path.split(__file__) directory = path.expanduser(directory) directory = path.abspath(directory) diff --git a/ida_script.py b/ida_script.py index 3c8a28956..07de59525 100644 --- a/ida_script.py +++ b/ida_script.py @@ -4,12 +4,12 @@ from __future__ import print_function import datetime import threading +import xmlrpclib +from SimpleXMLRPCServer import SimpleXMLRPCServer import idaapi import idautils import idc -import xmlrpclib -from SimpleXMLRPCServer import SimpleXMLRPCServer # Wait for any processing to get done idaapi.autoWait() diff --git a/pwndbg/commands/stack.py b/pwndbg/commands/stack.py index 987b8a5d1..99119a0ea 100644 --- a/pwndbg/commands/stack.py +++ b/pwndbg/commands/stack.py @@ -1,3 +1,8 @@ +from __future__ import absolute_import +from __future__ import division +from __future__ import print_function +from __future__ import unicode_literals + import argparse import gdb @@ -8,6 +13,7 @@ import pwndbg.commands import pwndbg.regs import pwndbg.vmmap + p = argparse.ArgumentParser(description=''' Print out the stack addresses that contain return addresses ''') diff --git a/pwndbg/elftypes.py b/pwndbg/elftypes.py index 7ce5e5e08..c5495dc1c 100644 --- a/pwndbg/elftypes.py +++ b/pwndbg/elftypes.py @@ -35,9 +35,10 @@ from __future__ import print_function from __future__ import unicode_literals import ctypes -import six import sys +import six + import pwndbg.arch import pwndbg.ctypes import pwndbg.events