From da7bdd50af366fe3f18a97eb3a37547cdfe074d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?=
 <ole.andre.ravnas@tillitech.com>
Date: Sat, 11 Jan 2014 20:38:20 +0100
Subject: [PATCH] Fix ordering of imports

---
 src/frida/discoverer.py  | 11 +++++++----
 src/frida/tracer.py      | 13 ++++++++-----
 tests/test_core.py       |  3 ++-
 tests/test_discoverer.py |  7 ++++---
 tests/test_tracer.py     |  7 ++++---
 5 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/src/frida/discoverer.py b/src/frida/discoverer.py
index 3e32688..37357e6 100644
--- a/src/frida/discoverer.py
+++ b/src/frida/discoverer.py
@@ -2,6 +2,7 @@
 
 from frida.core import ModuleFunction
 
+
 class Discoverer(object):
     def __init__(self, reactor):
         self._reactor = reactor
@@ -148,13 +149,15 @@ class UI(object):
 
 
 def main():
-    import colorama
-    from colorama import Fore, Back, Style
-    import frida
-    from frida.core import Reactor
     from optparse import OptionParser
     import sys
 
+    import colorama
+    from colorama import Fore, Back, Style
+
+    import frida
+    from frida.core import Reactor
+
     colorama.init(autoreset=True)
 
     usage = "usage: %prog [options] process-name-or-id"
diff --git a/src/frida/tracer.py b/src/frida/tracer.py
index f0de095..378fc5c 100644
--- a/src/frida/tracer.py
+++ b/src/frida/tracer.py
@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from frida.core import ModuleFunction
 import os
 import fnmatch
 import sys
 import time
 
+from frida.core import ModuleFunction
+
 
 class TracerProfileBuilder(object):
     def __init__(self):
@@ -412,13 +413,15 @@ class UI(object):
 
 
 def main():
-    import colorama
-    from colorama import Fore, Back, Style
-    import frida
-    from frida.core import Reactor
     from optparse import OptionParser
     import sys
 
+    import colorama
+    from colorama import Fore, Back, Style
+
+    import frida
+    from frida.core import Reactor
+
     colorama.init(autoreset=True)
 
     tp = TracerProfileBuilder()
diff --git a/tests/test_core.py b/tests/test_core.py
index b0e90bf..4ad8836 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import frida
 import platform
 import subprocess
 import sys
@@ -10,6 +9,8 @@ try:
 except:
     import unittest
 
+import frida
+
 
 class TestCore(unittest.TestCase):
     @classmethod
diff --git a/tests/test_discoverer.py b/tests/test_discoverer.py
index 3b4251f..70afa28 100644
--- a/tests/test_discoverer.py
+++ b/tests/test_discoverer.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import frida
-from frida.core import Reactor
-from frida.discoverer import Discoverer, UI
 import platform
 import subprocess
 import threading
@@ -11,6 +8,10 @@ try:
 except:
     import unittest
 
+import frida
+from frida.core import Reactor
+from frida.discoverer import Discoverer, UI
+
 
 class TestDiscoverer(unittest.TestCase):
     @classmethod
diff --git a/tests/test_tracer.py b/tests/test_tracer.py
index 8b0bb47..8104125 100644
--- a/tests/test_tracer.py
+++ b/tests/test_tracer.py
@@ -1,8 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import frida
-from frida.core import Reactor
-from frida.tracer import Tracer, TracerProfileBuilder, MemoryRepository, UI
 import platform
 import subprocess
 import threading
@@ -11,6 +8,10 @@ try:
 except:
     import unittest
 
+import frida
+from frida.core import Reactor
+from frida.tracer import Tracer, TracerProfileBuilder, MemoryRepository, UI
+
 
 class TestTracer(unittest.TestCase):
     @classmethod