Skip to content

Commit

Permalink
Satisfy mypy by using as when importing
Browse files Browse the repository at this point in the history
Thanks to python/mypy#7423 I understood that the problem was in my relationship with mypy.
  • Loading branch information
mariuszskon committed Sep 28, 2020
1 parent 9ac549a commit a9f42ad
Show file tree
Hide file tree
Showing 12 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
black --check --diff --color .
- name: Typecheck with mypy
run: |
mypy -m autorop
mypy .
- name: Test with pytest
env:
TERM: xterm # ensure pwntools import works
Expand Down
6 changes: 3 additions & 3 deletions autorop/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from pwn import *
from autorop.PwnState import PwnState
from autorop.pipeline import pipeline
import autorop.constants as constants
from autorop.toplevel.PwnState import PwnState as PwnState
from autorop.toplevel.pipeline import pipeline as pipeline
import autorop.toplevel.constants as constants
from autorop import constants
from autorop import bof
from autorop import call
Expand Down
6 changes: 3 additions & 3 deletions autorop/arutil/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from autorop.arutil.addressify import addressify
from autorop.arutil.call_overwriter import call_overwriter
from autorop.arutil.debug_requests import debug_requests
from autorop.arutil.addressify import addressify as addressify
from autorop.arutil.call_overwriter import call_overwriter as call_overwriter
from autorop.arutil.debug_requests import debug_requests as debug_requests
2 changes: 1 addition & 1 deletion autorop/bof/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from autorop.bof.corefile import corefile
from autorop.bof.corefile import corefile as corefile
2 changes: 1 addition & 1 deletion autorop/call/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from autorop.call.system_binsh import system_binsh
from autorop.call.system_binsh import system_binsh as system_binsh
2 changes: 1 addition & 1 deletion autorop/leak/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from autorop.leak.puts import puts
from autorop.leak.puts import puts as puts
2 changes: 1 addition & 1 deletion autorop/libc/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from autorop.libc.rip import rip
from autorop.libc.rip import rip as rip
File renamed without changes.
Empty file added autorop/toplevel/__init__.py
Empty file.
File renamed without changes.
2 changes: 1 addition & 1 deletion autorop/pipeline.py → autorop/toplevel/pipeline.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from autorop.PwnState import PwnState
from autorop import PwnState
from pwn import log
from pwn import context
from functools import reduce
Expand Down
2 changes: 1 addition & 1 deletion autorop/turnkey/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from autorop.turnkey.classic import classic
from autorop.turnkey.classic import classic as classic

0 comments on commit a9f42ad

Please sign in to comment.