-

cool-RR · cool-RR · commit 5e8f0aa2127f · 2013-08-25T23:13:52.000+03:00
diff --git a/python_toolbox/cute_profile/cute_profile.py b/python_toolbox/cute_profile/cute_profile.py
@@ -25,12 +25,12 @@ def profile(statement, globals_, locals_):
     except SystemExit:
         pass
     profile_.create_stats()
-    profile_result = marshal.dumps(self.stats, f)
+    profile_result = marshal.dumps(profile_.stats)
     return profile_result
 
 
 def profile_expression(expression, globals_, locals_):
-    profile_result = profile('result = %s' % expression, globals(), locals())
+    profile_result = profile('result = %s' % expression, globals_, locals_)
     return (locals()['result'], profile_result)
 
 
@@ -98,15 +98,9 @@ def inner(function_, *args, **kwargs):
                     'decorated_function.original_function(*args, **kwargs)',
                     globals(), locals()
                 )
-
-                
-                profile_handler = \
-                          profile_handling.get_profile_handler(profile_handler)
-                
-                profile_handler(profile_result)
-                
-                Z Z Z Do shit depending on `profile_handler`. Allow filename,  folder,  email address, or index for  printing (sort). In any case do everything on a thread.
                 
+                decorated_function.profile_handler(profile_result)
+
                 return result
             
             else: # decorated_function.profiling_on is False
@@ -119,7 +113,8 @@ def inner(function_, *args, **kwargs):
         decorated_function.profiling_on = None
         decorated_function.condition = condition
         decorated_function.off_after = off_after
-        decorated_function.sort = sort
+        decorated_function.profile_handler = \
+                          profile_handling.get_profile_handler(profile_handler)
         
         return decorated_function
     
diff --git a/python_toolbox/cute_profile/profile_handling.py b/python_toolbox/cute_profile/profile_handling.py
@@ -3,6 +3,7 @@
 
 import threading
 import datetime as datetime_module
+import abc
 import os.path
 import pstats
 
@@ -93,15 +94,16 @@ def __call__(self, profile_data):
 
 
 def get_profile_handler(profile_handler_string):
-    if misc_tools.is_legal_email_address(profile_handler_string.split('\n')
-                                                                          [0]):
-        return EmailProfileHandler(*profile_handler_string.split('\n'))
-    elif os.path.isdir(profile_handler_string):
-        return FolderProfileHandler(profile_handler_string)
-    else:
-        assert profile_handler_string == '' or int(profile_handler_string)
+    if not profile_handler_string or profile_handler_string in \
+                                                        map(str, range(-1, 5)):
         try:
             sort_order = int(profile_handler_string)
-        except ValueError:
+        except (ValueError, TypeError):
             sort_order = -1
-        return PrintProfileHandler(sort_order)
+        return PrintProfileHandler(sort_order)    
+    elif misc_tools.is_legal_email_address(profile_handler_string.split('\n')
+                                                                          [0]):
+        return EmailProfileHandler(*profile_handler_string.split('\n'))
+    else:
+        assert os.path.isdir(profile_handler_string)
+        return FolderProfileHandler(profile_handler_string)
