Fix formatting

Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>

Author: c00kiemon5ter

src/xmlsec/test/__init__.py

@@ -12,7 +12,7 @@ def find_alts(alts):
     return None
 
 
-def run_cmd(args,softhsm_conf=None):
+def run_cmd(args, softhsm_conf=None):
     env = {}
     if softhsm_conf is not None:
         env['SOFTHSM_CONF'] = softhsm_conf
@@ -25,4 +25,4 @@ def run_cmd(args,softhsm_conf=None):
         logging.debug(out)
     rv = proc.wait()
     if rv:
-        raise RuntimeError("command exited with code != 0: %d" % rv)
+        raise RuntimeError("command exited with code != 0: %d" % rv)

src/xmlsec/test/p11_test.py

@@ -4,7 +4,6 @@
 
 __author__ = 'leifj'
 
-import xmlsec
 import pkg_resources
 import unittest
 import logging
@@ -13,16 +12,21 @@
 import subprocess
 import shutil
 import tempfile
+
 from defusedxml import lxml
 from lxml import etree
-from . import find_alts, run_cmd
+
+import xmlsec
+from xmlsec.test import find_alts
+from xmlsec.test import run_cmd
+
+from xmlsec.test.case import load_test_data
 
 try:
     from PyKCS11 import PyKCS11Error
     from PyKCS11.LowLevel import CKR_PIN_INCORRECT
 except ImportError:
     raise unittest.SkipTest("PyKCS11 not installed")
-from xmlsec.test.case import load_test_data
 
 P11_MODULE = find_alts(['/usr/lib/libsofthsm.so', '/usr/lib/softhsm/libsofthsm.so', '/usr/lib/softhsm/libsofthsm2.so'])
 P11_ENGINE = find_alts(['/usr/lib/ssl/engines/libpkcs11.so','/usr/lib/engines/engine_pkcs11.so'])
@@ -53,10 +57,9 @@
     raise unittest.SkipTest("libengine-pkcs11-openssl is not installed")
 
 softhsm_version = 1
-if SOFTHSM=='/usr/bin/softhsm2-util':
+if SOFTHSM == '/usr/bin/softhsm2-util':
     softhsm_version = 2
 
-
 p11_test_files = []
 softhsm_conf = None
 server_cert_pem = None
@@ -69,6 +72,7 @@ def _tf():
     p11_test_files.append(f.name)
     return f.name
 
+
 def _td():
     d = tempfile.mkdtemp()
     p11_test_files.append(d)
@@ -95,14 +99,14 @@ def setup():
             else:
                 softhsm_db = _tf()
                 f.write("#Generated by pyXMLSecurity test\n0:%s\n" % softhsm_db)
-                
+
         logging.debug("Initializing the token")
         run_cmd([SOFTHSM,
                  '--slot', '0',
                  '--label', 'test',
                  '--init-token',
                  '--pin', 'secret1',
-                 '--so-pin', 'secret2'],softhsm_conf=softhsm_conf)
+                 '--so-pin', 'secret2'], softhsm_conf=softhsm_conf)
         logging.debug("Generating 1024 bit RSA key in token")
         run_cmd([PKCS11_TOOL,
                  '--module', P11_MODULE,
@@ -112,11 +116,11 @@ def setup():
                  '--slot-index', '0',
                  '--id', 'a1b2',
                  '--label', 'test',
-                 '--pin', 'secret1'],softhsm_conf=softhsm_conf)
+                 '--pin', 'secret1'], softhsm_conf=softhsm_conf)
         run_cmd([PKCS11_TOOL,
                  '--module', P11_MODULE,
                  '-l',
-                 '--pin', 'secret1', '-O'],softhsm_conf=softhsm_conf)
+                 '--pin', 'secret1', '-O'], softhsm_conf=softhsm_conf)
         global signer_cert_der
         global signer_cert_pem
         signer_cert_pem = _tf()
@@ -157,13 +161,13 @@ def setup():
                  '-keyform', 'engine',
                  '-key', 'pkcs11:token=test',
                  '-passin', 'pass:secret1',
-                 '-out', signer_cert_pem],softhsm_conf=softhsm_conf)
+                 '-out', signer_cert_pem], softhsm_conf=softhsm_conf)
 
         run_cmd([OPENSSL, 'x509',
                  '-inform', 'PEM',
                  '-outform', 'DER',
                  '-in', signer_cert_pem,
-                 '-out', signer_cert_der],softhsm_conf=softhsm_conf)
+                 '-out', signer_cert_der], softhsm_conf=softhsm_conf)
 
         logging.debug("Importing certificate into token")
 
@@ -175,9 +179,9 @@ def setup():
                  '--label', 'test',
                  '-y', 'cert',
                  '-w', signer_cert_der,
-                 '--pin', 'secret1'],softhsm_conf=softhsm_conf)
+                 '--pin', 'secret1'], softhsm_conf=softhsm_conf)
 
-    except Exception, ex:
+    except Exception as ex:
         print "-" * 64
         traceback.print_exc()
         print "-" * 64