diff options
| author | Rob Austein <sra@hactrn.net> | 2011-12-16 02:44:20 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2011-12-16 02:44:20 +0000 |
| commit | bbde00990b0aae93d4b3d9fac8d163f66eca0c43 (patch) | |
| tree | 1b51c35da1e247f0110bd0b39df1ce95f469a13f /rpkid/rpki/x509.py | |
| parent | 3c52d332ed264fb6d5257c9cde787fc9fc0624c3 (diff) | |
Checkpoint. Add EnumField. Debug CertificateManager.
svn path=/branches/tk100/; revision=4124
Diffstat (limited to 'rpkid/rpki/x509.py')
| -rw-r--r-- | rpkid/rpki/x509.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rpkid/rpki/x509.py b/rpkid/rpki/x509.py index b5300bee..bccdce03 100644 --- a/rpkid/rpki/x509.py +++ b/rpkid/rpki/x509.py @@ -166,14 +166,14 @@ class X501DN(object): assert ini is None or not kwargs if len(kwargs) == 1 and "CN" in kwargs: ini = kwargs.pop("CN") - if isinstance(ini, str): - self.dn = (((rpki.oids.name2oid["commonName"], ("printableString", cn)),),) + if isinstance(ini, (str, unicode)): + self.dn = (((rpki.oids.name2oid["commonName"], ("printableString", ini)),),) elif isinstance(ini, tuple): self.dn = ini elif kwargs: - raise NotImplementedError #("Sorry, I haven't implemented keyword arguments yet") + raise NotImplementedError("Sorry, I haven't implemented keyword arguments yet") elif ini is not None: - raise TypeError #("Don't know how to interpret %r as an X.501 DN" % (ini,), ini) + raise TypeError("Don't know how to interpret %r as an X.501 DN" % (ini,), ini) def __str__(self): return "".join("/" + "+".join("%s=%s" % (rpki.oids.oid2name[a[0]], a[1][1]) @@ -187,7 +187,7 @@ class X501DN(object): return self.dn def get_POW(self): - raise NotImplementedError #("Sorry, I haven't written the conversion to POW format yet") + raise NotImplementedError("Sorry, I haven't written the conversion to POW format yet") class DER_object(object): """ |