Mercurial > traipse_dev
annotate orpg/tools/decorators.py @ 216:a00b40ee92fc beta
Traipse Beta 'OpenRPG' {100430-00}
Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for
developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to
the code. 'Ornery-Orc's main goal is to offer more advanced features and enhance the productivity of the user.
Update Summary (Patch-2)
New Features:
New Namespace method with two new syntaxes
New Namespace Internal is context sensitive, always!
New Namespace External is 'as narrow as you make it'
New Namespace FutureCheck helps ensure you don't receive an incorrect node
New PluginDB access for URL2Link plugin
New to Forms, they now show their content in Design Mode
New to Update Manager, checks Repo for updates on software start
New to Mini Lin node, change title in design mode
Fixes:
Fix to Server GUI startup errors
Fix to Server GUI Rooms tab updating
Fix to Chat and Settings if non existant die roller is picked
Fix to Dieroller and .open() used with .vs(). Successes are correctly calculated
Fix to Alias Lib's Export to Tree, Open, Save features
Fix to alias node, now works properly
Fix to Splitter node, minor GUI cleanup
Fix to Backgrounds not loading through remote loader
Fix to Node name errors
Fix to rolling dice in chat Whispers
Fix to Splitters Sizing issues
Fix to URL2Link plugin, modified regex compilation should remove memory leak
Fix to mapy.py, a roll back due to zoomed grid issues
Fix to whiteboard_handler, Circles work by you clicking the center of the circle
Fix to Servers parse_incoming_dom which was outdated and did not respect XML
Fix to a broken link in the server welcome message
Fix to InterParse and logger requiring traceback
Fix to Update Manager Status Bar
Fix to failed image and erroneous pop up
Fix to Mini Lib node that was preventing use
Fix to plugins that parce dice but did not call InterParse
Fix to nodes for name changing by double click
Fix to Game Tree, node ordering on drag and drop corrected
author | sirebral |
---|---|
date | Fri, 30 Apr 2010 05:40:52 -0500 |
parents | 37a11fea3304 |
children |
rev | line source |
---|---|
72
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
1 import warnings |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
2 import functools |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
3 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
4 from orpg.orpgCore import * |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
5 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
6 def deprecated(msg=None): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
7 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
8 This is a decorator which can be used to mark functions |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
9 as deprecated. It will result in a warning being emitted |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
10 when the function is used. |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
11 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
12 def wrap(func): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
13 @functools.wraps(func) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
14 def new_func(*args, **kwargs): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
15 out = msg |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
16 if not out: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
17 out = "Call to deprecated function %s." |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
18 else: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
19 out = "Call to deprecated function %s.\n" + out |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
20 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
21 warnings.warn_explicit( |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
22 out % (func.__name__), |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
23 category=DeprecationWarning, |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
24 filename=func.func_code.co_filename, |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
25 lineno=func.func_code.co_firstlineno + 1 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
26 ) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
27 return func(*args, **kwargs) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
28 return new_func |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
29 return wrap |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
30 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
31 def pending_deprecation(msg=None): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
32 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
33 This is a decorator which can be used to mark functions |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
34 as deprecated. It will result in a warning being emitted |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
35 when the function is used. |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
36 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
37 def wrap(func): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
38 @functools.wraps(func) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
39 def new_func(*args, **kwargs): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
40 out = msg |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
41 if not out: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
42 out = "%s is Pending Deprecation." |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
43 else: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
44 out = "%s is Pending Deprecation.\n" + out |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
45 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
46 warnings.warn_explicit( |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
47 out % (func.__name__), |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
48 category=PendingDeprecationWarning, |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
49 filename=func.func_code.co_filename, |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
50 lineno=func.func_code.co_firstlineno + 1 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
51 ) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
52 return func(*args, **kwargs) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
53 return new_func |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
54 return wrap |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
55 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
56 def synchronized(lock): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
57 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
58 Synchronization decorator. |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
59 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
60 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
61 @functools.wraps(func) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
62 def new_func(*args, **kwargs): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
63 lock.acquire() |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
64 try: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
65 return func(*args, **kwargs) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
66 finally: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
67 lock.release() |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
68 return new_func |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
69 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
70 class memoized(object): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
71 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
72 Decorator that caches a function's return value each time it is called. |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
73 If called later with the same arguments, the cached value is returned, and |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
74 not re-evaluated. |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
75 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
76 def __init__(self, func): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
77 self.func = func |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
78 self.cache = {} |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
79 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
80 def __call__(self, *args, **kwargs): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
81 try: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
82 return self.cache[args + kwargs.values()] |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
83 except KeyError: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
84 self.cache[args] = value = self.func(*args, **kwargs) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
85 return value |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
86 except TypeError: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
87 # uncachable -- for instance, passing a list as an argument. |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
88 # Better to not cache than to blow up entirely. |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
89 return self.func(*args) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
90 def __repr__(self): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
91 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
92 Return the function's docstring. |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
93 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
94 return self.func.__doc__ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
95 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
96 def debugging(func): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
97 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
98 Decorator to print Enter/Exit debugging info |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
99 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
100 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
101 @functools.wraps(func) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
102 def new_func(*args, **kwargs): |
76
37a11fea3304
More clean up. Images now posts a Chat Info post if image doesn't load.
sirebral
parents:
72
diff
changeset
|
103 from orpg_log import logger |
72
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
104 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
105 if not ORPG_DEBUG & logger.log_level: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
106 return func(*args, **kwargs) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
107 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
108 if str(args[0].__class__).startswith('<class'): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
109 cls = args[0].__class__.__name__ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
110 args_s = "self" |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
111 if len(args) > 1: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
112 args_s += ', ' + ', '.join([str(attr) for attr in args[1:]]) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
113 kwargs_s = "" |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
114 for k,v in kwargs.iteritems(): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
115 kwargs_s += ', ' + k + '=' + str(v) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
116 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
117 call_str = '%(cls)s->%(fnc)s(%(args)s%(kwargs)s)' % { |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
118 'cls':cls, |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
119 'fnc':func.__name__, |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
120 'args':args_s, |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
121 'kwargs':kwargs_s} |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
122 try: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
123 logger.debug("Enter " + call_str) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
124 return func(*args, **kwargs) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
125 finally: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
126 logger.debug("Exit " + call_str) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
127 else: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
128 try: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
129 logger.debug("Enter " + func.__name__) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
130 return func(*args, **kwargs) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
131 finally: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
132 logger.debug("Exit " + func.__name__) |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
133 return new_func |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
134 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
135 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
136 Cannot use this decorator till we stop supporting py2.5 |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
137 as class decorators did not land till py2.6 I am just adding it here |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
138 So when we do we can convert all singleton classes to use it |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
139 """ |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
140 def singleton(cls): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
141 instances = {} |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
142 def getinstance(): |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
143 if cls not in instances: |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
144 instances[cls] = cls() |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
145 return instances[cls] |
8bc955faf819
Fixing a few mistakes from the last update. When Controls is finished I will be happy because users won't miss an file change due to these small updates.
sirebral
parents:
diff
changeset
|
146 return getinstance |