X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fstorage%2Fmodel.py;fp=sfa%2Fstorage%2Fmodel.py;h=b46c702291256f98273da79dcc4cbc1670b4647f;hp=a2e3bd49b3dfd89613cc019a36c26722e95b76f8;hb=04acd3228e5911d36d0cd58dc35b9319fc558e17;hpb=e5537b113b6fe5874fdcd5b12414568500aa106c diff --git a/sfa/storage/model.py b/sfa/storage/model.py index a2e3bd49..b46c7022 100644 --- a/sfa/storage/model.py +++ b/sfa/storage/model.py @@ -13,7 +13,6 @@ from sfa.storage.record import Record from sfa.util.sfalogging import logger from sfa.util.sfatime import utcparse, datetime_to_string from sfa.util.xml import XML -from sfa.util.py23 import StringType from sfa.trust.gid import GID @@ -105,7 +104,7 @@ class RegRecord(Base, AlchemyObj): if hrn: self.hrn = hrn if gid: - if isinstance(gid, StringType): + if isinstance(gid, str): self.gid = gid else: self.gid = gid.save_to_string(save_parents=True) @@ -143,7 +142,7 @@ class RegRecord(Base, AlchemyObj): def validate_gid(self, key, gid): if gid is None: return - elif isinstance(gid, StringType): + elif isinstance(gid, str): return gid else: return gid.save_to_string(save_parents=True)