Skip to content

Fixed imports to make rpc and asm module python3 compatible #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2017
Merged

Fixed imports to make rpc and asm module python3 compatible #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bap/asm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

"""Disassembled instuctions"""

from adt import ADT
from .adt import ADT

class Kind(ADT) : pass
class Having_side_effects(Kind) : pass
Expand Down
10 changes: 7 additions & 3 deletions src/bap/rpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-

import os, time, atexit
import os, time, atexit, sys
from signal import signal, SIGTERM
import requests
from subprocess import Popen
from mmap import mmap
from urlparse import urlparse, parse_qs
if sys.version_info > (3, 0):
from urllib.parse import urlparse, parse_qs
else:
from urlparse import urlparse, parse_qs

from tempfile import NamedTemporaryFile
import json
import adt, arm, asm, bil
from . import adt, arm, asm, bil

import threading

Expand Down