admin/frida-frida-python
1
0
Fork 0
mirror of https://github.com/frida/frida-python synced 2026-06-08 14:16:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20 from jgeralnik/master

Browse Source 
Fix colorama/readline collision
This commit is contained in:
Ole André Vadla Ravnås
2015-03-21 21:36:11 +01:00
parent 2054f92829 e03b536234
commit c61264c6ac
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frida/__init__.py
+4 -4
View File
@@ -70,15 +70,15 @@ def get_device_manager():
print("")
print("***")
if str(ex).startswith("No module named "):
print(Back.RED + Fore.WHITE + Style.BRIGHT + "Frida native extension not found")
print(Fore.WHITE + Style.BRIGHT + "Please check your PYTHONPATH.")
print(Back.RED + Fore.WHITE + Style.BRIGHT + "Frida native extension not found" + Style.RESET_ALL)
print(Fore.WHITE + Style.BRIGHT + "Please check your PYTHONPATH." + Style.RESET_ALL)
else:
print(Back.RED + Fore.WHITE + Style.BRIGHT + "Failed to load the Frida native extension: %s" % ex)
print(Back.RED + Fore.WHITE + Style.BRIGHT + "Failed to load the Frida native extension: %s" % ex + Style.RESET_ALL)
if sys.version_info[0] == 2:
current_python_version = "%d.%d" % sys.version_info[:2]
else:
current_python_version = "%d.x" % sys.version_info[0]
print(Fore.WHITE + Style.BRIGHT + "Please ensure that the extension was compiled for Python " + current_python_version + ".")
print(Fore.WHITE + Style.BRIGHT + "Please ensure that the extension was compiled for Python " + current_python_version + "." + Style.RESET_ALL)
print("***")
print("")
raise ex
src/frida/application.py
+2 -2
View File
@@ -22,7 +22,7 @@ def await_enter():
class ConsoleApplication(object):
def __init__(self, run_until_return=await_enter):
colorama.init(autoreset=True)
colorama.init()
parser = OptionParser(usage=self._usage())
parser.add_option("-U", "--usb", help="connect to USB device",
@@ -171,7 +171,7 @@ class ConsoleApplication(object):
cursor_position = "\033[A"
else:
cursor_position = ""
print("%-80s" % (cursor_position + Style.BRIGHT + message,))
print("%-80s" % (cursor_position + Style.BRIGHT + message + Style.RESET_ALL,))
self._status_updated = True
def find_device(type):
src/frida/repl.py
+1 -1
View File
@@ -133,7 +133,7 @@ def main():
if stanza['name'] == '+result':
output = json.dumps(value, sort_keys=True, indent=4, separators=(",", ": "))
else:
output = Fore.RED + Style.BRIGHT + value
output = Fore.RED + Style.BRIGHT + value + Style.RESET_ALL
sys.stdout.write(output + "\n")
sys.stdout.flush()
self._idle.set()