X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fcertificate.py;h=8e9cf7d996731eac1147d14d7e0149cd9a46ac86;hb=796d35d54ab31e209ddf76b4584b6508b309c6c1;hp=6f3ecc6268f25c222fc77d6270b6b9f47e4d7c81;hpb=ecc85e0b923922cf7117d29b380f5284edb88f21;p=sfa.git

diff --git a/sfa/trust/certificate.py b/sfa/trust/certificate.py
index 6f3ecc62..8e9cf7d9 100644
--- a/sfa/trust/certificate.py
+++ b/sfa/trust/certificate.py
@@ -641,8 +641,8 @@ class Certificate:
     def set_data(self, str, field='subjectAltName'):
         # pyOpenSSL only allows us to add extensions, so if we try to set the
         # same extension more than once, it will not work
-        if self.data.has_key(field):
-            raise "Cannot set ", field, " more than once"
+        if field in self.data:
+            raise Exception("Cannot set {} more than once".format(field))
         self.data[field] = str
         self.add_extension(field, 0, str)
 
@@ -650,7 +650,7 @@ class Certificate:
     # Return the data string that was previously set with set_data
 
     def get_data(self, field='subjectAltName'):
-        if self.data.has_key(field):
+        if field in self.data:
             return self.data[field]
 
         try: