Change all imports to absolute per PEP-328, and sort imports

pwn/__init__.py

@@ -1,5 +1,7 @@
 # Promote useful stuff to toplevel
-from .toplevel import *
+from __future__ import absolute_import
+
+from pwn.toplevel import *
 
 pwnlib.args.initialize()
 pwnlib.log.install_default_handler()

pwnlib/__init__.py

@@ -1,6 +1,8 @@
+from __future__ import absolute_import
+
 import importlib
 
-from .version import __version__
+from pwnlib.version import __version__
 
 version = __version__
 

pwnlib/abi.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
-from .context import LocalContext
-from .context import context
+from __future__ import absolute_import
+
+from pwnlib.context import LocalContext
+from pwnlib.context import context
 
 
 class ABI(object):

pwnlib/adb/__init__.py

@@ -1,2 +1,4 @@
-from .adb import *
-from .protocol import Client
+from __future__ import absolute_import
+
+from pwnlib.adb.adb import *
+from pwnlib.adb.protocol import Client

pwnlib/adb/adb.py

@@ -44,6 +44,8 @@
     adb.write('/data/local/tmp/foo', 'my data')
 
 """
+from __future__ import absolute_import
+
 import functools
 import glob
 import logging
@@ -57,14 +59,14 @@
 
 import dateutil.parser
 
-from .. import atexit
-from .. import tubes
-from ..context import LocalContext
-from ..context import context
-from ..device import Device
-from ..log import getLogger
-from ..util import misc
-from .protocol import Client
+from pwnlib import atexit
+from pwnlib import tubes
+from pwnlib.adb.protocol import Client
+from pwnlib.context import LocalContext
+from pwnlib.context import context
+from pwnlib.device import Device
+from pwnlib.log import getLogger
+from pwnlib.util import misc
 
 log = getLogger(__name__)
 

pwnlib/adb/protocol.py

@@ -4,21 +4,23 @@
 Documentation is available here:
 https://android.googlesource.com/platform/system/core/+/master/adb/protocol.txt
 """
+from __future__ import absolute_import
+
 import functools
 import stat
 import time
 
-from ..context import context
-from ..log import Logger
-from ..log import getLogger
-from ..tubes.listen import listen
-from ..tubes.process import process
-from ..tubes.remote import remote
-from ..util.lists import group
-from ..util.misc import size
-from ..util.packing import p32
-from ..util.proc import pidof
-from ..util.sh_string import sh_string
+from pwnlib.context import context
+from pwnlib.log import Logger
+from pwnlib.log import getLogger
+from pwnlib.tubes.listen import listen
+from pwnlib.tubes.process import process
+from pwnlib.tubes.remote import remote
+from pwnlib.util.lists import group
+from pwnlib.util.misc import size
+from pwnlib.util.packing import p32
+from pwnlib.util.proc import pidof
+from pwnlib.util.sh_string import sh_string
 
 log = getLogger(__name__)
 

pwnlib/args.py

@@ -39,14 +39,16 @@
 The full list of supported "magic arguments" and their effects are listed
 below.
 """
+from __future__ import absolute_import
+
 import collections
 import logging
 import os
 import string
 import sys
 
-from . import term
-from .context import context
+from pwnlib import term
+from pwnlib.context import context
 
 term_mode  = True
 args       = collections.defaultdict(str)

pwnlib/asm.py

@@ -39,6 +39,8 @@
     '   0:   b8 0b 00 00 00          mov    eax,0xb'
 
 """
+from __future__ import absolute_import
+
 import errno
 import os
 import platform
@@ -53,11 +55,11 @@
 from os import environ
 from os import path
 
-from . import atexit
-from . import shellcraft
-from .context import LocalContext
-from .context import context
-from .log import getLogger
+from pwnlib import atexit
+from pwnlib import shellcraft
+from pwnlib.context import LocalContext
+from pwnlib.context import context
+from pwnlib.log import getLogger
 
 log = getLogger(__name__)
 

pwnlib/atexception.py

@@ -2,12 +2,13 @@
 Analogous to atexit, this module allows the programmer to register functions to
 be run if an unhandled exception occurs.
 """
+from __future__ import absolute_import
 
 import sys
 import threading
 import traceback
 
-from .context import context
+from pwnlib.context import context
 
 __all__ = ['register', 'unregister']
 

pwnlib/atexit.py

@@ -7,12 +7,13 @@
 This module also fixes a the issue that exceptions raised by an exit handler is
 printed twice when the standard :mod:`atexit` is used.
 """
+from __future__ import absolute_import
 
 import sys
 import threading
 import traceback
 
-from .context import context
+from pwnlib.context import context
 
 __all__ = ['register', 'unregister']
 

pwnlib/commandline/asm.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python2
+from __future__ import absolute_import
+
 import argparse
 import sys
 
 from pwn import *
-
-from . import common
+from pwnlib.commandline import common
 
 parser = common.parser_commands.add_parser(
     'asm',

pwnlib/commandline/checksec.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python2
+from __future__ import absolute_import
+
 import argparse
 import sys
 
 from pwn import *
-
-from . import common
+from pwnlib.commandline import common
 
 parser = common.parser_commands.add_parser(
     'checksec',

pwnlib/commandline/constgrep.py

@@ -1,12 +1,12 @@
 #!/usr/bin/env python2
+from __future__ import absolute_import
 
 import argparse
 import os
 import re
 
 from pwn import *
-
-from . import common
+from pwnlib.commandline import common
 
 p = common.parser_commands.add_parser(
     'constgrep',

pwnlib/commandline/cyclic.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python2
+from __future__ import absolute_import
+
 import argparse
 import string
 import sys
 
 from pwn import *
-
-from . import common
+from pwnlib.commandline import common
 
 parser = common.parser_commands.add_parser(
     'cyclic',

pwnlib/commandline/disasm.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python2
+from __future__ import absolute_import
+
 import argparse
 import string
 import sys
 
 from pwn import *
-
-from . import common
+from pwnlib.commandline import common
 
 parser = common.parser_commands.add_parser(
     'disasm',

pwnlib/commandline/elfdiff.py

@@ -1,13 +1,14 @@
 #!/usr/bin/env python2
+from __future__ import absolute_import
+
 import shutil
 from argparse import ArgumentParser
 from subprocess import CalledProcessError
 from subprocess import check_output
 from tempfile import NamedTemporaryFile
 
 from pwn import *
-
-from . import common
+from pwnlib.commandline import common
 
 
 def dump(objdump, path):

pwnlib/commandline/elfpatch.py

@@ -1,10 +1,11 @@
 #!/usr/bin/env python2
+from __future__ import absolute_import
+
 import argparse
 import sys
 
 from pwn import *
-
-from . import common
+from pwnlib.commandline import common
 
 p = common.parser_commands.add_parser(
     'elfpatch',

pwnlib/commandline/errno.py

@@ -1,7 +1,9 @@
+from __future__ import absolute_import
+
 import argparse
 import os
 
-from . import common
+from pwnlib.commandline import common
 
 parser = common.parser_commands.add_parser(
     'errno',

pwnlib/commandline/hex.py

@@ -1,8 +1,10 @@
 #!/usr/bin/env python2
+from __future__ import absolute_import
+
 import argparse
 import sys
 
-from . import common
+from pwnlib.commandline import common
 
 parser = common.parser_commands.add_parser(
     'hex',

pwnlib/commandline/main.py

@@ -1,23 +1,25 @@
+from __future__ import absolute_import
+
 import sys
 
-from . import asm
-from . import checksec
-from . import common
-from . import constgrep
-from . import cyclic
-from . import disasm
-from . import elfdiff
-from . import elfpatch
-from . import errno
-from . import hex
-from . import phd
-from . import pwnstrip
-from . import scramble
-from . import shellcraft
-from . import unhex
-from . import update
-from ..context import context
-from .common import parser
+from pwnlib.commandline import asm
+from pwnlib.commandline import checksec
+from pwnlib.commandline import common
+from pwnlib.commandline import constgrep
+from pwnlib.commandline import cyclic
+from pwnlib.commandline import disasm
+from pwnlib.commandline import elfdiff
+from pwnlib.commandline import elfpatch
+from pwnlib.commandline import errno
+from pwnlib.commandline import hex
+from pwnlib.commandline import phd
+from pwnlib.commandline import pwnstrip
+from pwnlib.commandline import scramble
+from pwnlib.commandline import shellcraft
+from pwnlib.commandline import unhex
+from pwnlib.commandline import update
+from pwnlib.commandline.common import parser
+from pwnlib.context import context
 
 commands = {
     'asm': asm.main,

pwnlib/commandline/phd.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python2
+from __future__ import absolute_import
+
 import argparse
 import os
 import sys
 
 from pwn import *
-
-from . import common
+from pwnlib.commandline import common
 
 parser = common.parser_commands.add_parser(
     'phd',

pwnlib/commandline/pwnstrip.py

@@ -1,8 +1,9 @@
+from __future__ import absolute_import
+
 import argparse
 
 from pwn import *
-
-from . import common
+from pwnlib.commandline import common
 
 p = common.parser_commands.add_parser(
     'pwnstrip',

pwnlib/commandline/scramble.py

@@ -1,9 +1,10 @@
+from __future__ import absolute_import
+
 import argparse
 import sys
 
 from pwn import *
-
-from . import common
+from pwnlib.commandline import common
 
 parser = common.parser_commands.add_parser(
     'scramble',