git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstreammaster'
[sfa.git]
/
sfa
/
server
/
modpython
/
SfaRegistryModPython.py
diff --git
a/sfa/server/modpython/SfaRegistryModPython.py
b/sfa/server/modpython/SfaRegistryModPython.py
index
8879813
..
1be5480
100755
(executable)
--- a/
sfa/server/modpython/SfaRegistryModPython.py
+++ b/
sfa/server/modpython/SfaRegistryModPython.py
@@
-12,10
+12,10
@@
import traceback
import xmlrpclib
from mod_python import apache
-from sfa.plc.api import SfaAPI
from sfa.util.sfalogging import logger
+from sfa.plc.server import SfaApi
-api = SfaA
PI
(interface='registry')
+api = SfaA
pi
(interface='registry')
def handler(req):
try: