Fix unit tests for nfse

faio · May 11, 2023 · 03af353 · 03af353
1 parent 6ea3f00
commit 03af353
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/pytrustnfe/certificado.py b/pytrustnfe/certificado.py
@@ -20,7 +20,7 @@ def save_pfx(self):
 
 
 def extract_cert_and_key_from_pfx(pfx, password):
-    pfx = crypto.load_pkcs12(pfx, password)
+    pfx = crypto.load_pkcs12(pfx, password.encode())
     # PEM formatted private key
     key = crypto.dump_privatekey(crypto.FILETYPE_PEM, pfx.get_privatekey())
     # PEM formatted certificate

diff --git a/pytrustnfe/nfse/paulistana/__init__.py b/pytrustnfe/nfse/paulistana/__init__.py
@@ -13,14 +13,14 @@
 
 
 def sign_tag(certificado, **kwargs):
-    pkcs12 = crypto.load_pkcs12(certificado.pfx, certificado.password)
+    pkcs12 = crypto.load_pkcs12(certificado.pfx, certificado.password.encode())
     key = pkcs12.get_privatekey()
     if "nfse" in kwargs:
         for item in kwargs["nfse"]["lista_rps"]:
-            signed = crypto.sign(key, item["assinatura"], "SHA1")
+            signed = crypto.sign(key, item["assinatura"].encode(), "SHA1")
             item["assinatura"] = b64encode(signed).decode()
     if "cancelamento" in kwargs:
-        signed = crypto.sign(key, kwargs["cancelamento"]["assinatura"], "SHA1")
+        signed = crypto.sign(key, kwargs["cancelamento"]["assinatura"].encode(), "SHA1")
         kwargs["cancelamento"]["assinatura"] = b64encode(signed).decode()
 
 

diff --git a/tests/XMLs/paulistana_signature.xml b/tests/XMLs/paulistana_signature.xml
@@ -27,7 +27,8 @@ mh66HMVzAfE8vRNwW5b7m6nWS1SiHBon7/Mqsw4MIq3SC+J/fTbKpqwyfAuH2YZl
 AiQuQc85fyllAMLh2WrA7JgOLR/5tF3kLtpbHdECAwEAATANBgkqhkiG9w0BAQUF
 AAOBgQArdh+RyT6VxKGsXk1zhHsgwXfToe6GpTF4W8PHI1+T0WIsNForDhvst6nm
 QtgAhuZM9rxpOJuNKc+pM29EixpAiZZiRMCSWEItNyEVdUIi+YnKBcAHd88TwO86
-d126MWQ2O8cu5W1VoDp7hYBYKOnLbYi11/StO+0rzK+oPYAvIw==</X509Certificate>
+d126MWQ2O8cu5W1VoDp7hYBYKOnLbYi11/StO+0rzK+oPYAvIw==
+</X509Certificate>
 </X509Data>
 </KeyInfo>
 </Signature></PedidoEnvioLoteRPS>
diff --git a/tests/test_nfse_paulistana.py b/tests/test_nfse_paulistana.py
@@ -1,6 +1,6 @@
 # coding=utf-8
 
-import mock
+from unittest import mock
 import os.path
 import unittest
 from pytrustnfe.certificado import Certificado