Fixed syntax of exceptions to python3 compatibility

diff --git a/ctypescrypto/cipher.py b/ctypescrypto/cipher.py
index c2053e988354574d299e0bd1c36e6cf98c7ff701..367f2b937767a742d2a74b7cc1d2d501a303a722 100644 (file)
--- a/ctypescrypto/cipher.py
+++ b/ctypescrypto/cipher.py
@@ -42,7 +42,7 @@ class CipherType:
                """
                self.cipher = libcrypto.EVP_get_cipherbyname(cipher_name)
                if self.cipher is None:
-                       raise CipherError, "Unknown cipher: %s" % cipher_name
+                       raise CipherError("Unknown cipher: %s" % cipher_name)
 
        def __del__(self):
                pass
@@ -113,7 +113,7 @@ class Cipher:
                iv_ptr = c_char_p(iv)
                self.ctx = libcrypto.EVP_CIPHER_CTX_new()
                if self.ctx == 0:
-                       raise CipherError, "Unable to create cipher context"
+                       raise CipherError("Unable to create cipher context")
                self.encrypt = encrypt
                if encrypt: 
                        enc = 1
@@ -137,7 +137,7 @@ class Cipher:
                        result = libcrypto.EVP_CipherInit_ex(self.ctx, cipher_type.cipher, None, key_ptr, iv_ptr, c_int(enc))
                if result == 0:
                        self._clean_ctx()
-                       raise CipherError, "Unable to initialize cipher"
+                       raise CipherError("Unable to initialize cipher")
                self.cipher_type = cipher_type
                self.block_size = self.cipher_type.block_size()
                self.cipher_finalized = False
@@ -168,9 +168,9 @@ class Cipher:
                        called
                """
                if self.cipher_finalized :
-                       raise CipherError, "No updates allowed"
+                       raise CipherError("No updates allowed")
                if type(data) != type(""):
-                       raise TypeError, "A string is expected"
+                       raise TypeError("A string is expected")
                if len(data) <= 0:
                        return ""
                outbuf=create_string_buffer(self.block_size+len(data))
@@ -190,14 +190,14 @@ class Cipher:
                        state, they would be processed and returned.
                """
                if self.cipher_finalized :
-                       raise CipherError, "Cipher operation is already completed"
+                       raise CipherError("Cipher operation is already completed")
                outbuf=create_string_buffer(self.block_size)
                self.cipher_finalized = True
                outlen=c_int(0)
                result = libcrypto.EVP_CipherFinal_ex(self.ctx,outbuf , byref(outlen))
                if result == 0:
                        self._clean_ctx()
-                       raise CipherError, "Unable to finalize cipher"
+                       raise CipherError("Unable to finalize cipher")
                if outlen.value>0:
                        return outbuf.raw[:outlen.value]
                else:

diff --git a/ctypescrypto/digest.py b/ctypescrypto/digest.py
index 0098ab4109a36c15b3dd144624a62a18b5530317..5eeeaee68757614285fb8580484b32e0f0fc2913 100644 (file)
--- a/ctypescrypto/digest.py
+++ b/ctypescrypto/digest.py
@@ -45,7 +45,7 @@ class DigestType:
                self.digest_name = digest_name\r
                self.digest = libcrypto.EVP_get_digestbyname(self.digest_name)\r
                if self.digest is None:\r
-                       raise DigestError, "Unknown digest: %s" % self.digest_name\r
+                       raise DigestError("Unknown digest: %s" % self.digest_name)\r
 \r
        def __del__(self):\r
                pass\r
@@ -69,11 +69,11 @@ class Digest:
                self._clean_ctx()\r
                self.ctx = libcrypto.EVP_MD_CTX_create()\r
                if self.ctx == 0:\r
-                       raise DigestError, "Unable to create digest context"\r
+                       raise DigestError("Unable to create digest context")\r
                result = libcrypto.EVP_DigestInit_ex(self.ctx, digest_type.digest, None)\r
                if result == 0:\r
                        self._clean_ctx()\r
-                       raise DigestError, "Unable to initialize digest"\r
+                       raise DigestError("Unable to initialize digest")\r
                self.digest_type = digest_type\r
                self.digest_size = self.digest_type.digest_size()\r
                self.block_size = self.digest_type.block_size()\r
@@ -90,9 +90,9 @@ class Digest:
                                        otherwise only first length bytes\r
                """\r
                if self.digest_finalized:\r
-                       raise DigestError, "No updates allowed"\r
+                       raise DigestError("No updates allowed")\r
                if type(data) != type(""):\r
-                       raise TypeError, "A string is expected"\r
+                       raise TypeError("A string is expected")\r
                if length is None:\r
                        length=len(data)\r
                elif length> len(data):\r
@@ -114,7 +114,7 @@ class Digest:
                length = c_long(0)\r
                result = libcrypto.EVP_DigestFinal_ex(self.ctx, self.digest_out, byref(length))\r
                if result != 1 :\r
-                       raise DigestError, "Unable to finalize digest"\r
+                       raise DigestError("Unable to finalize digest")\r
                self.digest_finalized = True\r
                return self.digest_out.raw[:self.digest_size]\r
        def copy(self):\r

diff --git a/ctypescrypto/rand.py b/ctypescrypto/rand.py
index 5d51eedd77fb30fc0ea3a31e2aa322a57b35e622..f14c6f769836d76126b402c628829b46d9548b3d 100644 (file)
--- a/ctypescrypto/rand.py
+++ b/ctypescrypto/rand.py
@@ -17,11 +17,11 @@ def bytes( num, check_result=False):
        """
 
        if num <= 0 :
-               raise ValueError, "'num' should be > 0"
+               raise ValueError("'num' should be > 0")
        buffer = create_string_buffer(num)
        result = libcrypto.RAND_bytes(buffer, num) 
        if check_result and result == 0:
-               raise RandError, "Random Number Generator not seeded sufficiently"
+               raise RandError("Random Number Generator not seeded sufficiently")
        return buffer.raw[:num]
 
 def pseudo_bytes(num):
@@ -34,7 +34,7 @@ def pseudo_bytes(num):
                not for key generation etc.
        """
        if num <= 0 :
-               raise ValueError, "'num' should be > 0"
+               raise ValueError("'num' should be > 0")
        buffer = create_string_buffer(num)
        libcrypto.RAND_pseudo_bytes(buffer, num)
        return buffer.raw[:num]
@@ -46,7 +46,7 @@ def seed(data, entropy=None):
                value estimating amount of entropy  in the data (in bytes).
        """
        if type(data) != type(""):
-               raise TypeError, "A string is expected"
+               raise TypeError("A string is expected")
        ptr = c_char_p(data)
        size = len(data)
        if entropy is None: