Py3k (Gallopsled#817)

* Py3k

* Dont run py2 on CI

* Don't launch futurize on CI

* Move to latest isort options

* Modernize imports (isort>=5)

* Fix removed jump dir

.github/workflows/lint.yml

@@ -13,25 +13,18 @@ jobs:
         path: ~/.cache/pip
         key: ${{ matrix.os }}-cache-pip
 
-    - name: Set up Python 2.7
-      uses: actions/setup-python@v1
-      with:
-        python-version: 2.7
-
     - name: Set up Python 3.8
       uses: actions/setup-python@v1
       with:
         python-version: 3.8
 
     - name: Install linters
       run: |
-        pip install isort future
+        pip install isort
 
     - name: Run tests
       run: |
-        futurize --all-imports --stage1 --print-function --write --unicode-literals pwndbg tests
         git diff-index --quiet HEAD -- pwndbg tests
-        isort --check-only --diff --recursive pwndbg tests
-        python2.7 -m py_compile ida_script.py $(git ls-files 'pwndbg/*.py')
+        isort --check-only --diff pwndbg tests
         python3   -m py_compile               $(git ls-files 'pwndbg/*.py')
 

.isort.cfg

@@ -1,5 +1,4 @@
 [settings]
 indent='    '
-not_skip = __init__.py
 force_single_line = 1
 known_third_party=capstone,unicorn,six,psutil,pycparser,gdb

DEVELOPING.md

@@ -24,8 +24,6 @@ Feel free to update the list below!
 
 * Process properties can be retrieved thx to `pwndbg/proc.py` - e.g. using `pwndbg.proc.pid` will give us current process pid
 
-* We have an inthook to make it easier to work with Python 2 and gdb.Value objects - see the docstring in `pwndbg/inthook.py` . Specifically, it makes it so that you can call `int()` on a `gdb.Value` instance and get what you want. 
-
 * We have a wrapper for handling exceptions that are thrown by commands - defined in `pwndbg/exception.py` - current approach seems to work fine - by using `set exception-verbose on` - we get a stacktrace. If we want to debug stuff we can always do `set exception-debugger on`.
 
 * Some of pwndbg's functionality - e.g. memory fetching - require us to have an instance of proper `gdb.Type` - the problem with that is that there is no way to define our own types - we have to ask gdb if it detected particular type in this particular binary (that sucks). We do it in `pwndbg/typeinfo.py` and it works most of the time. The known bug with that is that it might not work properly for Golang binaries compiled with debugging symbols.

README.md

@@ -1,4 +1,4 @@
-# pwndbg [![license](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000)](https://github.com/pwndbg/pwndbg/blob/dev/LICENSE.md) [![Py2&3](https://img.shields.io/badge/Python-2%20%26%203-green.svg)]() [![IRC](https://img.shields.io/badge/freenode-%23pwndbg-red.svg)](https://webchat.freenode.net/?channels=#pwndbg)
+# pwndbg [![license](https://img.shields.io/github/license/mashape/apistatus.svg?maxAge=2592000)](https://github.com/pwndbg/pwndbg/blob/dev/LICENSE.md) [![IRC](https://img.shields.io/badge/freenode-%23pwndbg-red.svg)](https://webchat.freenode.net/?channels=#pwndbg)
 
 `pwndbg` (/poʊndbæg/) is a GDB plug-in that makes debugging with GDB suck less, with a focus on features needed by low-level software developers, hardware hackers, reverse-engineers and exploit developers.
 

gdbinit.py

@@ -1,31 +1,19 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import locale
 import sys
 from os import path
 
-import six
-
 directory, file = path.split(__file__)
 directory       = path.expanduser(directory)
 directory       = path.abspath(directory)
 
 sys.path.append(directory)
 
-# this is an unconventional workaround to
-# support unicode printing for python2
-# https://github.com/pwndbg/pwndbg/issues/117
-# on python3 it warns if the user has different
-# encoding than utf-8
+# warn if the user has different encoding than utf-8
 encoding = locale.getpreferredencoding()
-if six.PY2:
-    reload(sys)
-    sys.setdefaultencoding('utf-8')
 
-elif encoding != 'UTF-8':
+if encoding != 'UTF-8':
     print('******')
     print('Your encoding ({}) is different than UTF-8. pwndbg might not work properly.'.format(encoding))
     print('You might try launching gdb with:')

pwndbg/__init__.py

@@ -1,10 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import signal
 
 import gdb
@@ -68,7 +63,6 @@
 import pwndbg.exception
 import pwndbg.gdbutils.functions
 import pwndbg.heap
-import pwndbg.inthook
 import pwndbg.memory
 import pwndbg.net
 import pwndbg.proc
@@ -88,6 +82,7 @@
 
 try:
     import unicorn
+
     import pwndbg.emu
 except:
     pass

pwndbg/abi.py

@@ -1,9 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import functools
 import re
 
@@ -13,7 +8,7 @@
 import pwndbg.color.message as M
 
 
-class ABI(object):
+class ABI:
     """
     Encapsulates information about a calling convention.
     """

pwndbg/android.py

@@ -1,10 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import gdb
 
 import pwndbg.color.message as message

pwndbg/arch.py

@@ -1,10 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import struct
 import sys
 
@@ -66,10 +61,6 @@ def update():
     (8, 'big'):    '>Q',
     }.get((m.ptrsize, m.endian))
 
-    # Work around Python 2.7.6 struct.pack / unicode incompatibility
-    # See https://github.com/pwndbg/pwndbg/pull/336 for more information.
-    m.fmt = str(m.fmt)
-
     # Attempt to detect the qemu-user binary name
     if m.current == 'arm' and m.endian == 'big':
         m.qemu = 'armeb'

pwndbg/arguments.py

@@ -4,11 +4,6 @@
 Allows describing functions, specifically enumerating arguments which
 may be passed in a combination of registers and stack values.
 """
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import gdb
 from capstone import CS_GRP_CALL
 from capstone import CS_GRP_INT

pwndbg/argv.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import gdb
 

pwndbg/auxv.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import os
 import re

pwndbg/chain.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import gdb
 

pwndbg/color/__init__.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import os
 import re

pwndbg/color/backtrace.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import pwndbg.color.theme as theme
 import pwndbg.config as config

pwndbg/color/chain.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import pwndbg.color.theme as theme
 import pwndbg.config as config

pwndbg/color/context.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import pwndbg.color.theme as theme
 import pwndbg.config as config

pwndbg/color/disasm.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import capstone
 

pwndbg/color/enhance.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import pwndbg.color.theme as theme
 import pwndbg.config as config

pwndbg/color/hexdump.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import pwndbg.color.theme as theme
 import pwndbg.config as config

pwndbg/color/lexer.py

@@ -1,12 +1,6 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
 import re
 
-import six
 from pygments.lexer import RegexLexer
 from pygments.lexer import include
 from pygments.token import Comment
@@ -116,20 +110,3 @@ class PwntoolsLexer(RegexLexer):
             (r'[-*,.():]+', Punctuation)
         ]
     }
-
-# Note: convert all unicode() to str() if in Python2.7 since unicode_literals is enabled
-# The pygments<=2.2.0 (latest stable when commit) in Python2.7 use 'str' type in rules matching
-# We must convert all unicode back to str()
-if six.PY2:
-    def _to_str(obj):
-        type_ = type(obj)
-        if type_ in (tuple, list):
-            return type_(map(_to_str, obj))
-        elif type_ is unicode:
-            return str(obj)
-        return obj
-
-    PwntoolsLexer.tokens = {
-        _to_str(k): _to_str(v)
-        for k, v in PwntoolsLexer.tokens.iteritems()
-    }

pwndbg/color/memory.py

@@ -1,12 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-import six
-
 import pwndbg.color.theme as theme
 import pwndbg.config as config
 import pwndbg.vmmap
@@ -62,7 +55,7 @@ def get(address, text = None):
         old_color = color
         color = lambda x: rwx(old_color(x))
 
-    if text is None and isinstance(address, six.integer_types) and address > 255:
+    if text is None and isinstance(address, int) and address > 255:
         text = hex(int(address))
     if text is None:
         text = str(int(address))

pwndbg/color/message.py

@@ -1,8 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 from pwndbg import config
 from pwndbg.color import generateColorFunction

pwndbg/color/nearpc.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import pwndbg.color.theme as theme
 import pwndbg.config as config

pwndbg/color/syntax_highlight.py

@@ -1,8 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import itertools
 import os.path
@@ -15,8 +11,9 @@
 
 try:
     import pygments
-    import pygments.lexers
     import pygments.formatters
+    import pygments.lexers
+
     from pwndbg.color.lexer import PwntoolsLexer
 except ImportError:
     pygments = None

pwndbg/color/telescope.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import pwndbg.color.theme as theme
 import pwndbg.config as config

pwndbg/color/theme.py

@@ -1,9 +1,5 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
 
 import pwndbg.config