X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fstorage%2Fmodel.py;fp=sfa%2Fstorage%2Fmodel.py;h=923576e9609d6779d3dffa71ffa5df44a99f60cb;hb=30d9951e075d93127c3909dcb41be09b420b3525;hp=051ba87e15bfe82923877a755ffe9a2f14e02bc8;hpb=faa98a764e6a311400ac54933fca910c8bdd1cf2;p=sfa.git diff --git a/sfa/storage/model.py b/sfa/storage/model.py index 051ba87e..923576e9 100644 --- a/sfa/storage/model.py +++ b/sfa/storage/model.py @@ -1,4 +1,3 @@ -from types import StringTypes from datetime import datetime from sqlalchemy import or_, and_ @@ -14,6 +13,7 @@ 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 @@ -99,7 +99,7 @@ class RegRecord(Base, AlchemyObj): if type: self.type=type if hrn: self.hrn=hrn if gid: - if isinstance(gid, StringTypes): self.gid=gid + if isinstance(gid, StringType): self.gid=gid else: self.gid=gid.save_to_string(save_parents=True) if authority: self.authority=authority if peer_authority: self.peer_authority=peer_authority @@ -130,7 +130,7 @@ class RegRecord(Base, AlchemyObj): @validates ('gid') def validate_gid (self, key, gid): if gid is None: return - elif isinstance(gid, StringTypes): return gid + elif isinstance(gid, StringType): return gid else: return gid.save_to_string(save_parents=True) def validate_datetime (self, key, incoming):