Merge branch 'master' into senslab2
Sandrine Avakian [Thu, 21 Jun 2012 14:44:52 +0000 (16:44 +0200)]
Conflicts:
setup.py

1  2 
setup.py
sfa/client/sfi.py
sfa/planetlab/plslices.py
sfa/util/xrn.py

diff --cc setup.py
+++ b/setup.py
@@@ -32,12 -30,6 +30,15 @@@ packages = 
      'sfa/generic',
      'sfa/managers',
      'sfa/importer',
 +
 +
++
 +    'sfa/senslab',
 +
-     'sfa/planetlab',
++
++
++
 +
      'sfa/rspecs',
      'sfa/rspecs/elements',
      'sfa/rspecs/elements/versions',
Simple merge
Simple merge
diff --cc sfa/util/xrn.py
@@@ -116,9 -121,8 +121,9 @@@ class Xrn
      # provide either urn, or (hrn + type)
      def __init__ (self, xrn, type=None):
          if not xrn: xrn = ""
 +       
          # user has specified xrn : guess if urn or hrn
-         if xrn.startswith(Xrn.URN_PREFIX):
+         if Xrn.is_urn(xrn):
              self.hrn=None
              self.urn=xrn
              self.urn_to_hrn()