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
moved merge_rspec() from rspec.py to rspecHelper.py
[sfa.git]
/
sfa
/
managers
/
slice_manager_pl.py
diff --git
a/sfa/managers/slice_manager_pl.py
b/sfa/managers/slice_manager_pl.py
index
d141539
..
05c490f
100644
(file)
--- a/
sfa/managers/slice_manager_pl.py
+++ b/
sfa/managers/slice_manager_pl.py
@@
-9,7
+9,7
@@
from copy import deepcopy
from lxml import etree
from StringIO import StringIO
from types import StringTypes
from lxml import etree
from StringIO import StringIO
from types import StringTypes
-from sfa.util.rspec import merge_rspecs
+from sfa.util.rspec
Helper
import merge_rspecs
from sfa.util.namespace import *
from sfa.util.rspec import *
from sfa.util.specdict import *
from sfa.util.namespace import *
from sfa.util.rspec import *
from sfa.util.specdict import *