Merge pull request #38 from astagi/feature/positionalarguments

Use positional arguments with format

Author: Roland Hedberg

src/jwkest/ecc.py

@@ -29,12 +29,12 @@ def by_name(name):
         if name == "P-521" or name == b'P-521':
             return NISTEllipticCurve(521)
         else:
-            raise Exception("Unknown curve {}".format(name))
+            raise Exception("Unknown curve {0}".format(name))
 
     # Get the name of this curve
     # XXX This only works because we only support prime curves right now
     def name(self):
-        return "P-{}".format(self.bits)
+        return "P-{0}".format(self.bits)
 
     # Integer-to-byte-string conversion
     def int2bytes(self, x):

src/jwkest/jws.py

@@ -321,7 +321,7 @@ def headers(self, extra=None):
         return _header
 
     def _get_keys(self):
-        logger.debug("_get_keys(): self._dict.keys={}".format(
+        logger.debug("_get_keys(): self._dict.keys={0}".format(
             self._dict.keys()))
 
         if "jwk" in self:
@@ -361,7 +361,7 @@ def _pick_keys(self, keys, use="", alg=""):
             logger.error("Unknown arlgorithm '%s'" % alg)
             return []
 
-        logger.debug("Picking key by key type={}".format(_k))
+        logger.debug("Picking key by key type={0}".format(_k))
         _kty = [_k.lower(), _k.upper(), _k.lower().encode("utf-8"),
                 _k.upper().encode("utf-8")]
         _keys = [k for k in keys if k.kty in _kty]
@@ -370,12 +370,12 @@ def _pick_keys(self, keys, use="", alg=""):
         except KeyError:
             _kid = None
 
-        logger.debug("Picking key based on alg={}, kid={} and use={}".format(
+        logger.debug("Picking key based on alg={0}, kid={1} and use={2}".format(
             alg, _kid, use))
 
         pkey = []
         for _key in _keys:
-            logger.debug("KEY: {}".format(_key))
+            logger.debug("KEY: {0}".format(_key))
             if _kid:
                 try:
                     assert _kid == _key.kid
@@ -519,7 +519,7 @@ def verify_compact(self, jws, keys=None, allow_none=False, sigalg=None):
                     raise SignerAlgError("none not allowed")
 
         if sigalg and sigalg != jwt.headers["alg"]:
-            raise SignerAlgError("Expected {} got {}".format(
+            raise SignerAlgError("Expected {0} got {1}".format(
                 sigalg, jwt.headers["alg"]))
 
         self["alg"] = _alg = jwt.headers["alg"]