Skip to content

Commit

Permalink
Merge pull request #5 from MichaWe/master
Browse files Browse the repository at this point in the history
Fixed imports to make rpc and asm module python3 compatible
  • Loading branch information
ivg authored Aug 7, 2017
2 parents 925f2b1 + 57d4834 commit 688cf83
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/bap/asm.py
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
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

0 comments on commit 688cf83

Please sign in to comment.