From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Thu, 21 Jun 2012 14:44:52 +0000 (+0200)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~152^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=cedf37c8661ec0b05349274962bf2db9cfa6a24d;p=sfa.git

Merge branch 'master' into senslab2

Conflicts:
	setup.py
---

cedf37c8661ec0b05349274962bf2db9cfa6a24d
diff --cc setup.py
index eafced43,a0c222a0..96cb8cb1
--- a/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',
diff --cc sfa/util/xrn.py
index 60b57b98,083e620f..19b1fc18
--- a/sfa/util/xrn.py
+++ b/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()