git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Python2.5 changed the max levels of inheritence.
[nodemanager.git]
/
sm.py
diff --git
a/sm.py
b/sm.py
index
abbcaec
..
a050ded
100644
(file)
--- a/
sm.py
+++ b/
sm.py
@@
-13,6
+13,7
@@
try: from bwlimit import bwmin, bwmax
except ImportError: bwmin, bwmax = 8, 1000*1000*1000
import accounts
import api
except ImportError: bwmin, bwmax = 8, 1000*1000*1000
import accounts
import api
+import api_calls
import database
import delegate
import logger
import database
import delegate
import logger
@@
-142,5
+143,5
@@
def start(options, config):
accounts.register_class(delegate.Delegate)
accounts.Startingup = options.startup
database.start()
accounts.register_class(delegate.Delegate)
accounts.Startingup = options.startup
database.start()
- api.deliver_ticket = deliver_ticket
+ api
_calls
.deliver_ticket = deliver_ticket
api.start()
api.start()